commit 3b1e0a655f8eba44ab1ee2a1068d169ccfb853b9
author YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Wed Mar 26 02:26:21 2008 +0900
committer YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Wed Mar 26 04:39:55 2008 +0900
tree 09edb35f32ebcfb1b4dad904425128a110ef16ee
parent c346dca10840a874240c78efe3f39acf4312a1f2

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

Introduce per-sock inlines: sock_net(), sock_net_set()
and per-inet_timewait_sock inlines: twsk_net(), twsk_net_set().
Without CONFIG_NET_NS, no namespace other than &init_net exists.
Let's explicitly define them to help compiler optimizations.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

net/irda/af_irda.c

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 6f21a53..ae54b20 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -837,7 +837,7 @@
 
 	IRDA_DEBUG(2, "%s()\n", __func__);
 
-	err = irda_create(sk->sk_net, newsock, sk->sk_protocol);
+	err = irda_create(sock_net(sk), newsock, sk->sk_protocol);
 	if (err)
 		return err;