lkml.org 
[lkml]   [2013]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 22/91] net: secure_seq: Fix warning when CONFIG_IPV6 and CONFIG_INET are not selected
    Date
    3.8.13.13 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Fabio Estevam <fabio.estevam@freescale.com>

    [ Upstream commit cb03db9d0e964568407fb08ea46cc2b6b7f67587 ]

    net_secret() is only used when CONFIG_IPV6 or CONFIG_INET are selected.

    Building a defconfig with both of these symbols unselected (Using the ARM
    at91sam9rl_defconfig, for example) leads to the following build warning:

    $ make at91sam9rl_defconfig

    $ make net/core/secure_seq.o
    scripts/kconfig/conf --silentoldconfig Kconfig
    CHK include/config/kernel.release
    CHK include/generated/uapi/linux/version.h
    CHK include/generated/utsrelease.h
    make[1]: `include/generated/mach-types.h' is up to date.
    CALL scripts/checksyscalls.sh
    CC net/core/secure_seq.o
    net/core/secure_seq.c:17:13: warning: 'net_secret_init' defined but not used [-Wunused-function]

    Fix this warning by protecting the definition of net_secret() with these
    symbols.

    Reported-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    [ kamal: backport to 3.8 (context) ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/core/secure_seq.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c
    index e61a8bb..53fcc11 100644
    --- a/net/core/secure_seq.c
    +++ b/net/core/secure_seq.c
    @@ -10,6 +10,7 @@

    #include <net/secure_seq.h>

    +#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_INET)
    static u32 net_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned;

    static int __init net_secret_init(void)
    @@ -18,6 +19,7 @@ static int __init net_secret_init(void)
    return 0;
    }
    late_initcall(net_secret_init);
    +#endif

    #ifdef CONFIG_INET
    static u32 seq_scale(u32 seq)
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-11-08 04:01    [W:4.203 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site