From patchwork Wed Feb 28 13:32:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 129987 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1030058lja; Wed, 28 Feb 2018 05:33:34 -0800 (PST) X-Google-Smtp-Source: AG47ELslTD6FEhm6+/62/4Fw9HCeWF454xfrLO5gAtX7jF0lwOXSkGl7mXooJxfgkeWI8z388ywE X-Received: by 2002:a17:902:599b:: with SMTP id p27-v6mr12946429pli.289.1519824814741; Wed, 28 Feb 2018 05:33:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519824814; cv=none; d=google.com; s=arc-20160816; b=b0NkI2pFYoPUuXNM/JKpwOkam6Ib79nKhL+h43UUCPC08wmcfX+O3svNg+cRRnXTLi WGBC3MYHMebUV9ds81T1Ew3jzGxv7dW2M4AIlSwc2J3fXr3vyKzYhznDjJlplvb5PHvP QvY9Hu6gUaKJvH24xPAevTY8vaP/uTG4PvfNcQvzl5gQNKPTh+u4GTzRlufLdzvfMrO5 yCpKCNXthiaPY2p1pWZ/JT7LEazNORBgdXNBL9vJwH+REgFNTOu+vxwjOrRPN59mDzQb JmzLSN4ef2NzElEM8HvfW1Skm+jBPE5ffHVyecOvSL3oxscqdPb5JBhTd0f4f+tRseO6 VWew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ICIXl92MHe8n0PScq+g5kKf/XR5lrcaYQE9LZoDApjw=; b=Jl0ENbd14xzguleUc+Y1kKi3afYdWPBlUpEkIRRltCGd2CRQEX5wY0xuJ3apxXCxHr bShAuWYnFY1FfIGGnrB9EOxoDrifXPmB9LkFHygViPvtnOzmHoU7u+22Xo01nLHwYL3l Akh/LW1BA4GcOPWzggiJ+wHFUzPlXmFWewE1T+6d76IvFYGJuhU5UTD8TmIEBsfxoSop MMDa+AMA54pH2ZE8MdRzfS+Y9e0jTECcCJdpN/HxgQCQIPj6ZYGpPjh0nY/UIYi73+ZS GN/N2FFsM1ITMeeflZZ3jMjplCfPxD0M8YuTlVGdxfXJ4VeCBZ4No49Upcox6RIZBBNV u2lA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u132si1027446pgc.802.2018.02.28.05.33.34; Wed, 28 Feb 2018 05:33:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752615AbeB1Nd2 (ORCPT + 28 others); Wed, 28 Feb 2018 08:33:28 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:47909 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752469AbeB1Nd0 (ORCPT ); Wed, 28 Feb 2018 08:33:26 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MBSfG-1ey8bc3SNy-00AUro; Wed, 28 Feb 2018 14:33:15 +0100 From: Arnd Bergmann To: "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI Cc: Jianlin Shi , Sabrina Dubroca , Stefano Brivio , Arnd Bergmann , David Ahern , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: ipv4: avoid unused variable warning for sysctl Date: Wed, 28 Feb 2018 14:32:48 +0100 Message-Id: <20180228133310.1816221-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:GuEI6Gy/ujjYdIMBRnIPiDzRJncFk19uV4JM3y/8KnEi2t/I7qk 7OYI3gzWi/YAz/yJwUcJeWT7LGmJ6Xa9Mj2fmORA3CRDz6E5hN4Vqzgf27RvGQJOqL5iPHD VX/VKL1yZDBC5H7oJghqlxvU0UD89z4vS2FwmAt/ORMjyIvc4m1oYDucp+8U/lrZ26B3Y9z oRCw6dO1fq4J27YWocRhA== X-UI-Out-Filterresults: notjunk:1; V01:K0:RJJklWIbVl4=:axdcu3eiCJQjBUxiduACI7 /GVUcS+Mm67jw8uhlL6yispUWLG+M//FaWqUtOWE0Rzg8syXXIzGjrmhjlxRzSCgrASb9pDwh weRe+BaHHxW04aXhQnXzTl51T+IaODjXTb0y28zUC6uGJr67tkcSLcbrW/mIQrhhowjqShAfc nJGFYCvK0xOiGRkuEeelNYRKyioN/JHxxC4ObLUgHAzf2WVuafy/ycE3JFPXp68zx5G0KTkOm LxW4ffy71UvKUhYplQIHSBp5cDBfGc8QyjZIc86XTC1XgC3HWhGnUugWhXy1kGGq4bb0H3oyW 4CM5GtPlR7NvLb+ti03mGp4hZ0mS9heFdHwydzLACrOiogDLkVzvPzdz0Kz/Lz6PRW1D+tanE ipYXkp0Wlsv3ti844yXHHila73dboNjtdStwZqJW2TXpfLD6g5wbW7gDpjHRkijHWIm/RvG2/ TQUUDkuOwBMm41afgEsrITT8ECTlZe6n5GAThmPgXyL2NEf/92CO2vm+NP9EJjdIS18SyoPGq ONFyQWbDTH4hk6emzmO78Dw8CmOBaDrxTLn2byvE0eXIswe6jRlvGFyggFHuD1dTV5ePbTkvp GdOTa9H4o5rWlspzwyuIBFzPAyRJ8oeqiY28CFizZC9NLUOvlXfhgEMxj2s9va+NMlrCUMPt+ kayPtbrV4NhDj35n7X788dYHomfWzAl9O2exvfusO0o5KL7NknAte8n89yfpuYlUtGeyNmGQW hyycxpI9MTwJA/RmaWoLF91Qq7ugxPZEXaBjAQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- net/ipv4/route.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.9.0 Acked-by: Sabrina Dubroca diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 5c85db355d1f..8d1f5c3a1745 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -132,8 +132,6 @@ static int ip_rt_min_advmss __read_mostly = 256; 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. */ @@ -2805,6 +2803,7 @@ void ip_rt_multicast_event(struct in_device *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,