From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE49DC47253 for ; Fri, 1 May 2020 13:27:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9EB2F2166E for ; Fri, 1 May 2020 13:27:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339673; bh=XMuA9rMJ/mUO09Xunuab3qn9TuUgvQQ5WmIVH/TUMYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=omTsd9upyGsAZYg6kroT0jnMAl+S6mnjwg8OZEAWKn4Bxw4PLfMlv535k7tP0UhHt iKKXQL7iEqj2c+zdF0J0zpPhvqhAvvwEJcHAf3HWu39FRs9kdLvNZXmdqvInWOa8UQ 7ot939dl2QsYjcNcgZWIuxc3rYMQ6Uv5SYtu82VA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729539AbgEAN1w (ORCPT ); Fri, 1 May 2020 09:27:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:50342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729524AbgEAN1r (ORCPT ); Fri, 1 May 2020 09:27:47 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 219DD20757; Fri, 1 May 2020 13:27:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339667; bh=XMuA9rMJ/mUO09Xunuab3qn9TuUgvQQ5WmIVH/TUMYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0Iz3PZc/1jCgnPcm17AFsY5bjKIdTGcJZYDsD0N2dwM3XSIBrxCWNbR66zP2LoQqn emIScGEmNmsI76MM/31qG0ddWppX81Sg3Xn2O8AxNJa9mNb63yGEbMAC1Gpm5/W8+6 j0b61TPTg4Skwlirxm9JMlzouZsb2Df+0+7gfs04= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Sabrina Dubroca , "David S. Miller" , Guenter Roeck Subject: [PATCH 4.9 03/80] net: ipv4: avoid unused variable warning for sysctl Date: Fri, 1 May 2020 15:20:57 +0200 Message-Id: <20200501131514.590273014@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131513.810761598@linuxfoundation.org> References: <20200501131513.810761598@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann 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 Acked-by: Sabrina Dubroca Signed-off-by: David S. Miller Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- 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,