Return-Path: Received: from mail-wi0-f170.google.com ([209.85.212.170]:36356 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751104AbbDZHLI (ORCPT ); Sun, 26 Apr 2015 03:11:08 -0400 Received: by wizk4 with SMTP id k4so65295676wiz.1 for ; Sun, 26 Apr 2015 00:11:07 -0700 (PDT) From: Dirk Behme To: stable@vger.kernel.org Cc: Dirk Behme Subject: [PATCH for 3.19.y to 3.10.y] net: sysctl_net_core: remove unused variable one Date: Sun, 26 Apr 2015 09:11:03 +0200 Message-Id: <1430032263-5094-1-git-send-email-dirk.behme@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: Back porting the upstream commit b1cb59cf2efe7 ("net: sysctl_net_core: check SNDBUF and RCVBUF for min length") to -stable introduces a compiler warning net/core/sysctl_net_core.c:26:12: warning: ‘one’ defined but not used [-Wunused-variable] static int one = 1; While upstream has an additional user of the variable 'one' after that commit ("tstamp_allow_data"), -stable doesn't have any user of 'one' any more, resulting in above compiler warning. Or in other words: -stable doesn't have the commit b245be1f4db1a0 ("net-timestamp: no-payload only sysctl") introducing the additional user of 'one'. Fix the compiler warning by removing the unused variable. Signed-off-by: Dirk Behme --- Note: This has been observed on 3.14.y. Having a quick look through the logs it should apply to all -stable branches from 3.19.y to 3.10.y. net/core/sysctl_net_core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index e731c96..8725b91 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -23,7 +23,6 @@ #include static int zero = 0; -static int one = 1; static int ushort_max = USHRT_MAX; static int min_sndbuf = SOCK_MIN_SNDBUF; static int min_rcvbuf = SOCK_MIN_RCVBUF; -- 2.3.6