Message ID | C8A6796DE7C66C4ABCBC18106CB6C1CC106D903183@ESESSCMS0356.eemea.ericsson.se |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
Hello, [...] > 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)" [...] Well spotted in terms of "net-next" branch and/or repository. In my case, I was working against "ipvs-next" using Simon's tree on github (I have made the fork when kernel.org facilities were not available at the time): https://github.com/horms/ipvs-next, and the code line you still appear to have in Dave's "net-next" (if that is the one) was amended in the following commit made against "ipvs-next": commit 833656973cde30ba067a994c4802ebab6c9557ee Author: Simon Horman <horms@verge.net.au> Date: Fri Sep 16 14:11:49 2011 +0900 ipvs: Remove unused return value of protocol state transitions Acked-by: Julian Anastasov <ja@ssi.bg> Acked-by Hans Schillstrom <hans@schillstrom.com> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> It wasn't there when I went about cleaning unused declaration of "cs". I guess we have to make sure that everything between github (and repositories there) and kernel.org repositories like Dave's "net-next" align and holds water. Just by looking at some files, I can see that "net-next" is missing some commits. KW -- 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
>Hello, > >[...] >> 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)" >[...] > >Well spotted in terms of "net-next" branch and/or repository. > >In my case, I was working against "ipvs-next" using Simon's tree on >github (I have made the fork when kernel.org facilities were not >available at the time): https://github.com/horms/ipvs-next, and the >code line you still appear to have in Dave's "net-next" (if that is >the one) was amended in the following commit made against "ipvs-next": Sorry, I didn't use that repo... (waiting for ipvs return to kernel.org) > > >commit 833656973cde30ba067a994c4802ebab6c9557ee >Author: Simon Horman <horms@verge.net.au> >Date: Fri Sep 16 14:11:49 2011 +0900 > > ipvs: Remove unused return value of protocol state transitions > > Acked-by: Julian Anastasov <ja@ssi.bg> > Acked-by Hans Schillstrom <hans@schillstrom.com> > Signed-off-by: Simon Horman <horms@verge.net.au> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > From what I can see Simon made a pull request and it was Acked by Pablo 28 Sep http://www.spinics.net/lists/netfilter-devel/msg19742.html I have not seen any output to Miller yet... but I might be wrong in that case > >It wasn't there when I went about cleaning unused declaration of "cs". >I guess we have to make sure that everything between github (and >repositories there) and kernel.org repositories like Dave's "net-next" >align and holds water. Just by looking at some files, I can see that >"net-next" is missing some commits. > >KW Regards Hans-- 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
On Wed, Oct 19, 2011 at 12:37:51PM +0200, Hans Schillström wrote: > > >Hello, > > > >[...] > >> 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)" > >[...] > > > >Well spotted in terms of "net-next" branch and/or repository. > > > >In my case, I was working against "ipvs-next" using Simon's tree on > >github (I have made the fork when kernel.org facilities were not > >available at the time): https://github.com/horms/ipvs-next, and the > >code line you still appear to have in Dave's "net-next" (if that is > >the one) was amended in the following commit made against "ipvs-next": > > Sorry, I didn't use that repo... > (waiting for ipvs return to kernel.org) It may take a little while for me to get into the new kernel.org web of trust which needs to happen before ipvs moves back to kernel.org. > > > >commit 833656973cde30ba067a994c4802ebab6c9557ee > >Author: Simon Horman <horms@verge.net.au> > >Date: Fri Sep 16 14:11:49 2011 +0900 > > > > ipvs: Remove unused return value of protocol state transitions > > > > Acked-by: Julian Anastasov <ja@ssi.bg> > > Acked-by Hans Schillstrom <hans@schillstrom.com> > > Signed-off-by: Simon Horman <horms@verge.net.au> > > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > > > > >From what I can see Simon made a pull request and it was Acked by Pablo 28 Sep > http://www.spinics.net/lists/netfilter-devel/msg19742.html > > I have not seen any output to Miller yet... > but I might be wrong in that case Yes, it seems that Pablo has picked up the change but it hasn't propagated to Dave's tree for one reason or another. > >It wasn't there when I went about cleaning unused declaration of "cs". > >I guess we have to make sure that everything between github (and > >repositories there) and kernel.org repositories like Dave's "net-next" > >align and holds water. Just by looking at some files, I can see that > >"net-next" is missing some commits. > > > >KW > > Regards > Hans -- 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
On Wed, Oct 19, 2011 at 12:37:51PM +0200, Hans Schillström wrote: > >commit 833656973cde30ba067a994c4802ebab6c9557ee > >Author: Simon Horman <horms@verge.net.au> > >Date: Fri Sep 16 14:11:49 2011 +0900 > > > > ipvs: Remove unused return value of protocol state transitions > > > > Acked-by: Julian Anastasov <ja@ssi.bg> > > Acked-by Hans Schillstrom <hans@schillstrom.com> > > Signed-off-by: Simon Horman <horms@verge.net.au> > > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > > > > From what I can see Simon made a pull request and it was Acked by Pablo 28 Sep > http://www.spinics.net/lists/netfilter-devel/msg19742.html > > I have not seen any output to Miller yet... > but I might be wrong in that case This patch is in my nf-next tree: http://1984.lsi.us.es/git/?p=net-next/.git;a=shortlog;h=refs/heads/nf-next David just pulled from my nf tree for bugfix yesterday. I expect to send him nf-next updates by today. -- 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
On Wed, Oct 19, 2011 at 07:49:57PM +0900, Simon Horman wrote: > Yes, it seems that Pablo has picked up the change but > it hasn't propagated to Dave's tree for one reason or another. I was waiting for david to take bugfixes for his net tree. This happened yesterday. Now I'll send updates for net-next. I expect to make it along today, please, be patient, they'll show up in david's net-next tree soon :-) -- 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
On Wed, Oct 19, 2011 at 01:11:12PM +0200, Pablo Neira Ayuso wrote: > On Wed, Oct 19, 2011 at 07:49:57PM +0900, Simon Horman wrote: > > Yes, it seems that Pablo has picked up the change but > > it hasn't propagated to Dave's tree for one reason or another. > > I was waiting for david to take bugfixes for his net tree. This > happened yesterday. Now I'll send updates for net-next. > > I expect to make it along today, please, be patient, they'll show up > in david's net-next tree soon :-) Hi Pablo, thanks for the clarification. I can be patient :-) -- 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);