commit c346dca10840a874240c78efe3f39acf4312a1f2
author YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Tue Mar 25 21:47:49 2008 +0900
committer YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Wed Mar 26 04:39:53 2008 +0900
tree c04cff20124eba5cc337cc5ec260ad2513eeb065
parent 7cbca67c073263c179f605bdbbdc565ab29d801d

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

Introduce per-net_device inlines: dev_net(), dev_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/ipv6/reassembly.c

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index f936d04..4e14476 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -600,7 +600,7 @@
 		return 1;
 	}
 
-	net = skb->dev->nd_net;
+	net = dev_net(skb->dev);
 	if (atomic_read(&net->ipv6.frags.mem) > net->ipv6.frags.high_thresh)
 		ip6_evictor(net, ip6_dst_idev(skb->dst));