lkml.org 
[lkml]   [2020]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 03/80] net: ipv4: avoid unused variable warning for sysctl
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    commit 773daa3caf5d3f87fdb1ab43e9c1b367a38fa394 upstream.

    The newly introudced ip_min_valid_pmtu variable is only used when
    CONFIG_SYSCTL is set:

    net/ipv4/route.c:135:12: error: 'ip_min_valid_pmtu' defined but not used [-Werror=unused-variable]

    This moves it to the other variables like it, to avoid the harmless
    warning.

    Fixes: c7272c2f1229 ("net: ipv4: don't allow setting net.ipv4.route.min_pmtu below 68")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Acked-by: Sabrina Dubroca <sd@queasysnail.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Cc: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/ipv4/route.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/net/ipv4/route.c
    +++ b/net/ipv4/route.c
    @@ -131,8 +131,6 @@ static int ip_rt_min_advmss __read_mostl

    static int ip_rt_gc_timeout __read_mostly = RT_GC_TIMEOUT;

    -static int ip_min_valid_pmtu __read_mostly = IPV4_MIN_MTU;
    -
    /*
    * Interface to generic destination cache.
    */
    @@ -2712,6 +2710,7 @@ void ip_rt_multicast_event(struct in_dev
    static int ip_rt_gc_interval __read_mostly = 60 * HZ;
    static int ip_rt_gc_min_interval __read_mostly = HZ / 2;
    static int ip_rt_gc_elasticity __read_mostly = 8;
    +static int ip_min_valid_pmtu __read_mostly = IPV4_MIN_MTU;

    static int ipv4_sysctl_rtcache_flush(struct ctl_table *__ctl, int write,
    void __user *buffer,

    \
     
     \ /
      Last update: 2020-05-01 15:28    [W:5.046 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site