From patchwork Wed Oct 19 09:23:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans Schillstrom X-Patchwork-Id: 120577 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2D549B71D1 for ; Wed, 19 Oct 2011 20:24:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754256Ab1JSJX6 (ORCPT ); Wed, 19 Oct 2011 05:23:58 -0400 Received: from mailgw10.se.ericsson.net ([193.180.251.61]:59248 "EHLO mailgw10.se.ericsson.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752667Ab1JSJX5 convert rfc822-to-8bit (ORCPT ); Wed, 19 Oct 2011 05:23:57 -0400 X-AuditID: c1b4fb3d-b7c26ae0000035b9-2d-4e9e972b5956 Received: from esessmw0237.eemea.ericsson.se (Unknown_Domain [153.88.253.125]) by mailgw10.se.ericsson.net (Symantec Mail Security) with SMTP id 1E.FA.13753.C279E9E4; Wed, 19 Oct 2011 11:23:56 +0200 (CEST) Received: from ESESSCMS0356.eemea.ericsson.se ([169.254.1.250]) by esessmw0237.eemea.ericsson.se ([153.88.115.90]) with mapi; Wed, 19 Oct 2011 11:23:55 +0200 From: =?Windows-1252?Q?Hans_Schillstr=F6m?= To: Krzysztof Wilczynski , Simon Horman CC: Patrick McHardy , "netdev@vger.kernel.org" Date: Wed, 19 Oct 2011 11:23:54 +0200 Subject: RE: [PATCH] ipvs: Remove unused variable "cs" from ip_vs_leave function. Thread-Topic: [PATCH] ipvs: Remove unused variable "cs" from ip_vs_leave function. Thread-Index: AcyN0IRnIQkLJrkRTQGu7H+loiT2NgAbwX0X Message-ID: References: <1318967989-14076-1-git-send-email-krzysztof.wilczynski@linux.com> In-Reply-To: <1318967989-14076-1-git-send-email-krzysztof.wilczynski@linux.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Brightmail-Tracker: AAAAAA== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hello >This is to address the following warning during compilation time: > > net/netfilter/ipvs/ip_vs_core.c: In function ‘ip_vs_leave’: > net/netfilter/ipvs/ip_vs_core.c:532: warning: unused variable ‘cs’ > >This variable is indeed no longer in use. > >Signed-off-by: Krzysztof Wilczynski In my code there is another fix needed as well (todays net-next) i.e. usage od cs "cs = ip_vs_set_state(cp, IP_VS_DIR_INPUT, skb, pd)" >--- > net/netfilter/ipvs/ip_vs_core.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > >diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c >index 00ea1ad..4f7d89d 100644 >--- a/net/netfilter/ipvs/ip_vs_core.c >+++ b/net/netfilter/ipvs/ip_vs_core.c >@@ -529,7 +529,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, > a cache_bypass connection entry */ > ipvs = net_ipvs(net); > if (ipvs->sysctl_cache_bypass && svc->fwmark && unicast) { >- int ret, cs; >+ int ret; > struct ip_vs_conn *cp; > unsigned int flags = (svc->flags & IP_VS_SVC_F_ONEPACKET && > iph.protocol == IPPROTO_UDP)? >-- >1.7.7 Regards Hans Schillstrom --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 4f77bb1..a4ef9c6 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -530,7 +530,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, a cache_bypass connection entry */ ipvs = net_ipvs(net); if (ipvs->sysctl_cache_bypass && svc->fwmark && unicast) { - int ret, cs; + int ret; struct ip_vs_conn *cp; unsigned int flags = (svc->flags & IP_VS_SVC_F_ONEPACKET && iph.protocol == IPPROTO_UDP)? @@ -557,7 +557,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, ip_vs_in_stats(cp, skb); /* set state */ - cs = ip_vs_set_state(cp, IP_VS_DIR_INPUT, skb, pd); + ip_vs_set_state(cp, IP_VS_DIR_INPUT, skb, pd); /* transmit the first SYN packet */ ret = cp->packet_xmit(skb, cp, pd->pp);