[PATCH 1/2 net-2.6.26] [NETNS]: Compilation fix for include/linux/netdevice.h.

[PATCH 1/2 net-2.6.26] [NETNS]: Compilation fix for include/linux/netdevice.h.

[Denis V. Lunev]

Commit commit c346dca10840a874240c78efe3f39acf4312a1f2
([NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS)
breaks compilation with CONFIG_NET_NS set.

Fix the typo.

Signed-off-by: Denis V. Lunev <den@openvz.org>
---
 include/linux/netdevice.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index d146be4..06ca84d 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -756,7 +756,7 @@ static inline
 void dev_net_set(struct net_device *dev, const struct net *net)
 {
 #ifdef CONFIG_NET_NS
-	dev->nd_dev = net;
+	dev->nd_net = net;
 #endif
 }
 
-- 
1.5.3.rc5

[PATCH 2/2 net-2.6.26] [NETNS]: Compilation warnings under CONFIG_NET_NS.

[Denis V. Lunev]

Recent commits from YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
have been introduced a several compilation warnings
'assignment discards qualifiers from pointer target type'
due to extra const modifier in the inline call parameters of
{dev|sock|twsk}_net_set.

Drop it.

Signed-off-by: Denis V. Lunev <den@openvz.org>
---
 include/linux/netdevice.h        |    2 +-
 include/net/inet_timewait_sock.h |    2 +-
 include/net/sock.h               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 06ca84d..15fa84a 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -753,7 +753,7 @@ struct net *dev_net(const struct net_device *dev)
 }
 
 static inline
-void dev_net_set(struct net_device *dev, const struct net *net)
+void dev_net_set(struct net_device *dev, struct net *net)
 {
 #ifdef CONFIG_NET_NS
 	dev->nd_net = net;
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 07fe0d1..95c660c 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -219,7 +219,7 @@ struct net *twsk_net(const struct inet_timewait_sock *twsk)
 }
 
 static inline
-void twsk_net_set(struct inet_timewait_sock *twsk, const struct net *net)
+void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net)
 {
 #ifdef CONFIG_NET_NS
 	twsk->tw_net = net;
diff --git a/include/net/sock.h b/include/net/sock.h
index 7e0d4a0..1c9d059 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1358,7 +1358,7 @@ struct net *sock_net(const struct sock *sk)
 }
 
 static inline
-void sock_net_set(struct sock *sk, const struct net *net)
+void sock_net_set(struct sock *sk, struct net *net)
 {
 #ifdef CONFIG_NET_NS
 	sk->sk_net = net;
-- 
1.5.3.rc5

Re: [PATCH 2/2 net-2.6.26] [NETNS]: Compilation warnings under CONFIG_NET_NS.

[David Miller]

From: "Denis V. Lunev" <den@openvz.org>
Date: Wed, 26 Mar 2008 10:40:59 +0300

> Recent commits from YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> have been introduced a several compilation warnings
> 'assignment discards qualifiers from pointer target type'
> due to extra const modifier in the inline call parameters of
> {dev|sock|twsk}_net_set.
> 
> Drop it.
> 
> Signed-off-by: Denis V. Lunev <den@openvz.org>

Also applied, thanks a lot.

Re: [PATCH 1/2 net-2.6.26] [NETNS]: Compilation fix for include/linux/netdevice.h.

[David Miller]

From: "Denis V. Lunev" <den@openvz.org>
Date: Wed, 26 Mar 2008 10:40:58 +0300

> Commit commit c346dca10840a874240c78efe3f39acf4312a1f2
> ([NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS)
> breaks compilation with CONFIG_NET_NS set.
> 
> Fix the typo.
> 
> Signed-off-by: Denis V. Lunev <den@openvz.org>

Applied.

Too bad allmodconfig doesn't enable things which are y/n only.

Re: [PATCH 1/2 net-2.6.26] [NETNS]: Compilation fix for include/linux/netdevice.h.

[Denis V. Lunev]

On Wed, 2008-03-26 at 00:47 -0700, David Miller wrote:
> From: "Denis V. Lunev" <den@openvz.org>
> Date: Wed, 26 Mar 2008 10:40:58 +0300
> 
> > Commit commit c346dca10840a874240c78efe3f39acf4312a1f2
> > ([NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS)
> > breaks compilation with CONFIG_NET_NS set.
> > 
> > Fix the typo.
> > 
> > Signed-off-by: Denis V. Lunev <den@openvz.org>
> 
> Applied.
> 
> Too bad allmodconfig doesn't enable things which are y/n only.

We are in trouble for this right now :( there we do not work with SYSFS
enabled right now.

Re: [PATCH 1/2 net-2.6.26] [NETNS]: Compilation fix for include/linux/netdevice.h.

[YOSHIFUJI Hideaki / 吉藤英明]

In article <20080326.004742.92048899.davem@davemloft.net> (at Wed, 26 Mar 2008 00:47:42 -0700 (PDT)), David Miller <davem@davemloft.net> says:

> From: "Denis V. Lunev" <den@openvz.org>
> Date: Wed, 26 Mar 2008 10:40:58 +0300
> 
> > Commit commit c346dca10840a874240c78efe3f39acf4312a1f2
> > ([NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS)
> > breaks compilation with CONFIG_NET_NS set.
> > 
> > Fix the typo.
> > 
> > Signed-off-by: Denis V. Lunev <den@openvz.org>
> 
> Applied.
> 
> Too bad allmodconfig doesn't enable things which are y/n only.

Sorry for the typo.

Unfortunately, NET_NS depends on !SYSFS,
so allyesconfig might not help...

--yoshfuji

Re: [PATCH 1/2 net-2.6.26] [NETNS]: Compilation fix for include/linux/netdevice.h.

[Daniel Lezcano]

YOSHIFUJI Hideaki / 吉藤英明 wrote:
> In article <20080326.004742.92048899.davem@davemloft.net> (at Wed, 26 Mar 2008 00:47:42 -0700 (PDT)), David Miller <davem@davemloft.net> says:
> 
>> From: "Denis V. Lunev" <den@openvz.org>
>> Date: Wed, 26 Mar 2008 10:40:58 +0300
>>
>>> Commit commit c346dca10840a874240c78efe3f39acf4312a1f2
>>> ([NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS)
>>> breaks compilation with CONFIG_NET_NS set.
>>>
>>> Fix the typo.
>>>
>>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> Applied.
>>
>> Too bad allmodconfig doesn't enable things which are y/n only.
> 
> Sorry for the typo.
> 
> Unfortunately, NET_NS depends on !SYSFS,
> so allyesconfig might not help...

Eric Biederman told us he has community acceptance for his approach and 
he will push sysfs per namespace in a few weeks.

Re: [Devel] Re: [PATCH 1/2 net-2.6.26] [NETNS]: Compilation fix for include/linux/netdevice.h.

[Alexey Dobriyan]

On Wednesday 26 March 2008 10:47:42 David Miller wrote:
> From: "Denis V. Lunev" <den@openvz.org>
> Date: Wed, 26 Mar 2008 10:40:58 +0300
>
> > Commit commit c346dca10840a874240c78efe3f39acf4312a1f2
> > ([NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS)
> > breaks compilation with CONFIG_NET_NS set.
> >
> > Fix the typo.
> >
> > Signed-off-by: Denis V. Lunev <den@openvz.org>
>
> Applied.
>
> Too bad allmodconfig doesn't enable things which are y/n only.

Right now NET_NS can be more or less reliably selected via:

    echo '# CONFIG_SYSFS is not set' >foo
    echo 'CONFIG_NET_NS=y'           >>foo
    KCONFIG_ALLCONFIG=foo make allmodconfig

But this trick a) doesn't work with some options, b) likely to break when
someone will start selecting SYSFS.