| Message ID | 1295930418-14980-1-git-send-email-xiaosuo@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jan 25, 2011 at 12:40:18PM +0800, Changli Gao wrote: > Fix compiler warnings when IP_VS_DBG() isn't defined. > > Signed-off-by: Changli Gao <xiaosuo@gmail.com> Thanks, I will queue this up for when nf-next-2.6 is open again. -- 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 Tuesday, January 25, 2011 05:40:18 Changli Gao wrote: > Fix compiler warnings when IP_VS_DBG() isn't defined. > > Signed-off-by: Changli Gao <xiaosuo@gmail.com> Acked-by: Hans Schillstrom <hans.schillstrom@ericsson.com> > --- > net/netfilter/ipvs/ip_vs_core.c | 4 +--- > 3 files changed, 9 insertions(+), 3 deletions(-) > diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c > index f36a84f..d889f4f 100644 > --- a/net/netfilter/ipvs/ip_vs_core.c > +++ b/net/netfilter/ipvs/ip_vs_core.c > @@ -1894,9 +1894,7 @@ static int __net_init __ip_vs_init(struct net *net) > > static void __net_exit __ip_vs_cleanup(struct net *net) > { > - struct netns_ipvs *ipvs = net_ipvs(net); > - > - IP_VS_DBG(10, "ipvs netns %d released\n", ipvs->gen); > + IP_VS_DBG(10, "ipvs netns %d released\n", net_ipvs(net)->gen); > } > > static struct pernet_operations ipvs_core_ops = { > -- Thanks I forgot that one. 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
On 25.01.2011 06:05, Simon Horman wrote: > On Tue, Jan 25, 2011 at 12:40:18PM +0800, Changli Gao wrote: >> Fix compiler warnings when IP_VS_DBG() isn't defined. >> >> Signed-off-by: Changli Gao <xiaosuo@gmail.com> > > Thanks, I will queue this up for when nf-next-2.6 is open again. It's already open. -- 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 Tue, Jan 25, 2011 at 11:25:42AM +0100, Patrick McHardy wrote: > On 25.01.2011 06:05, Simon Horman wrote: > > On Tue, Jan 25, 2011 at 12:40:18PM +0800, Changli Gao wrote: > >> Fix compiler warnings when IP_VS_DBG() isn't defined. > >> > >> Signed-off-by: Changli Gao <xiaosuo@gmail.com> > > > > Thanks, I will queue this up for when nf-next-2.6 is open again. > > It's already open. > Hi Patrick, I'm a little unsure how you would like me to differentiate between fixes for 2.6.38 - e.g. my previous two pull requests. And patches intended for 2.6.39. In any case I will send a pull request that includes Changli's change against nf-next-2.6. -- 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 Tue, Jan 25, 2011 at 11:09:35PM +1000, Simon Horman wrote: > On Tue, Jan 25, 2011 at 11:25:42AM +0100, Patrick McHardy wrote: > > On 25.01.2011 06:05, Simon Horman wrote: > > > On Tue, Jan 25, 2011 at 12:40:18PM +0800, Changli Gao wrote: > > >> Fix compiler warnings when IP_VS_DBG() isn't defined. > > >> > > >> Signed-off-by: Changli Gao <xiaosuo@gmail.com> > > > > > > Thanks, I will queue this up for when nf-next-2.6 is open again. > > > > It's already open. > > > > Hi Patrick, > > I'm a little unsure how you would like me to differentiate > between fixes for 2.6.38 - e.g. my previous two pull requests. > And patches intended for 2.6.39. > > In any case I will send a pull request that includes > Changli's change against nf-next-2.6. Actually, I realise that Changli's change is actually 2.6.38 material. I'll send a pull request. Please ignore my noise about 2.6.39. -- 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 25.01.2011 14:09, Simon Horman wrote: > On Tue, Jan 25, 2011 at 11:25:42AM +0100, Patrick McHardy wrote: >> On 25.01.2011 06:05, Simon Horman wrote: >>> On Tue, Jan 25, 2011 at 12:40:18PM +0800, Changli Gao wrote: >>>> Fix compiler warnings when IP_VS_DBG() isn't defined. >>>> >>>> Signed-off-by: Changli Gao <xiaosuo@gmail.com> >>> >>> Thanks, I will queue this up for when nf-next-2.6 is open again. >> >> It's already open. >> > > Hi Patrick, > > I'm a little unsure how you would like me to differentiate > between fixes for 2.6.38 - e.g. my previous two pull requests. > And patches intended for 2.6.39. Oh, I thought those were intended for -next because it included a netns fix. Best is to just state the intended tree in your pull request. > In any case I will send a pull request that includes > Changli's change against nf-next-2.6. Thanks. -- 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, On Tue, 25 Jan 2011, Simon Horman wrote: >> Hi Patrick, >> >> I'm a little unsure how you would like me to differentiate >> between fixes for 2.6.38 - e.g. my previous two pull requests. >> And patches intended for 2.6.39. >> >> In any case I will send a pull request that includes >> Changli's change against nf-next-2.6. > > Actually, I realise that Changli's change is actually > 2.6.38 material. I'll send a pull request. Please ignore > my noise about 2.6.39. Simon, I don't see IPVS netns work in 2.6.38-rc2, so these changes are not for 2.6.38-rc. Regards -- Julian Anastasov <ja@ssi.bg> -- 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 f36a84f..d889f4f 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -1894,9 +1894,7 @@ static int __net_init __ip_vs_init(struct net *net) static void __net_exit __ip_vs_cleanup(struct net *net) { - struct netns_ipvs *ipvs = net_ipvs(net); - - IP_VS_DBG(10, "ipvs netns %d released\n", ipvs->gen); + IP_VS_DBG(10, "ipvs netns %d released\n", net_ipvs(net)->gen); } static struct pernet_operations ipvs_core_ops = {
Fix compiler warnings when IP_VS_DBG() isn't defined. Signed-off-by: Changli Gao <xiaosuo@gmail.com> --- net/netfilter/ipvs/ip_vs_core.c | 4 +--- 3 files changed, 9 insertions(+), 3 deletions(-) -- 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