[GIT PULL nf-next-2.6] IPVS changes for 2.6.38-rc3

[GIT PULL nf-next-2.6] IPVS changes for 2.6.38-rc3

[Simon Horman]

Hi Patrick,

please consider pulling
  git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git for-patrick

Which includes the following changes, both of which I believe 2.6.38 material.

Changli Gao (1):
      netfilter: ipvs: fix compiler warnings

Hans Schillstrom (1):
      IPVS netns BUG, register sysctl for root ns

 net/netfilter/ipvs/ip_vs_core.c |    4 +---
 net/netfilter/ipvs/ip_vs_ctl.c  |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

[PATCH 1/2] IPVS netns BUG, register sysctl for root ns

[Simon Horman]

From: Hans Schillstrom <hans.schillstrom@ericsson.com>

The newly created table was not used when register sysctl for a new namespace.
I.e. sysctl doesn't work for other than root namespace (init_net)

Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_ctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 68b8033..98df59a 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3556,7 +3556,7 @@ int __net_init __ip_vs_control_init(struct net *net)
 
 
 	ipvs->sysctl_hdr = register_net_sysctl_table(net, net_vs_ctl_path,
-						  vs_vars);
+						     tbl);
 	if (ipvs->sysctl_hdr == NULL)
 		goto err_reg;
 	ip_vs_new_estimator(net, ipvs->tot_stats);
-- 
1.7.2.3

[PATCH 2/2] netfilter: ipvs: fix compiler warnings

[Simon Horman]

From: Changli Gao <xiaosuo@gmail.com>

Fix compiler warnings when IP_VS_DBG() isn't defined.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_core.c |    4 +---
 1 files changed, 1 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);

Re: [GIT PULL nf-next-2.6] IPVS changes for 2.6.38-rc3

[Patrick McHardy]

On 25.01.2011 14:17, Simon Horman wrote:
> Hi Patrick,
> 
> please consider pulling
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git for-patrick
> 
> Which includes the following changes, both of which I believe 2.6.38 material.
> 
> Changli Gao (1):
>       netfilter: ipvs: fix compiler warnings
> 
> Hans Schillstrom (1):
>       IPVS netns BUG, register sysctl for root ns

That tree is based on nf-next-2.6, so I can't pull this into my nf-2.6
tree.

Re: [GIT PULL nf-next-2.6] IPVS changes for 2.6.38-rc3

[Simon Horman]

On Tue, Jan 25, 2011 at 03:01:35PM +0100, Patrick McHardy wrote:
> On 25.01.2011 14:17, Simon Horman wrote:
> > Hi Patrick,
> > 
> > please consider pulling
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git for-patrick
> > 
> > Which includes the following changes, both of which I believe 2.6.38 material.
> > 
> > Changli Gao (1):
> >       netfilter: ipvs: fix compiler warnings
> > 
> > Hans Schillstrom (1):
> >       IPVS netns BUG, register sysctl for root ns
> 
> That tree is based on nf-next-2.6, so I can't pull this into my nf-2.6
> tree.

Hi Patrick,

Sorry about this.

As it turns out I was mistaken in assuming that the IPVS netns changes
had been merged into nf-2.6. They haven't, they only exist in net-next-2.6.

All of the recent patches that I have passed on to you relate to the IPVS
netns changes so nf-next-2.6 is the right place for these fixes. So could
you please pull the above tree into nf-next-2.6? I do not believe there are
any nf-2.6 changes at this time.

Thanks

Re: [GIT PULL nf-next-2.6] IPVS changes for 2.6.38-rc3

[Patrick McHardy]

On 26.01.2011 00:57, Simon Horman wrote:
> On Tue, Jan 25, 2011 at 03:01:35PM +0100, Patrick McHardy wrote:
>> On 25.01.2011 14:17, Simon Horman wrote:
>>> Hi Patrick,
>>>
>>> please consider pulling
>>>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git for-patrick
>>>
>>> Which includes the following changes, both of which I believe 2.6.38 material.
>>>
>>> Changli Gao (1):
>>>       netfilter: ipvs: fix compiler warnings
>>>
>>> Hans Schillstrom (1):
>>>       IPVS netns BUG, register sysctl for root ns
>>
>> That tree is based on nf-next-2.6, so I can't pull this into my nf-2.6
>> tree.
> 
> Hi Patrick,
> 
> Sorry about this.
> 
> As it turns out I was mistaken in assuming that the IPVS netns changes
> had been merged into nf-2.6. They haven't, they only exist in net-next-2.6.
> 
> All of the recent patches that I have passed on to you relate to the IPVS
> netns changes so nf-next-2.6 is the right place for these fixes. So could
> you please pull the above tree into nf-next-2.6? I do not believe there are
> any nf-2.6 changes at this time.

Thanks, I've pulled it into nf-next-2.6.git.