aboutsummaryrefslogtreecommitdiffstats
path: root/net/econet/af_econet.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-03-25 08:47:49 -0400
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-03-25 15:39:53 -0400
commitc346dca10840a874240c78efe3f39acf4312a1f2 (patch)
treec04cff20124eba5cc337cc5ec260ad2513eeb065 /net/econet/af_econet.c
parent7cbca67c073263c179f605bdbbdc565ab29d801d (diff)
[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>
Diffstat (limited to 'net/econet/af_econet.c')
-rw-r--r--net/econet/af_econet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index bc0f6252613f..68d154480043 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -1064,7 +1064,7 @@ static int econet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
1064 struct sock *sk; 1064 struct sock *sk;
1065 struct ec_device *edev = dev->ec_ptr; 1065 struct ec_device *edev = dev->ec_ptr;
1066 1066
1067 if (dev->nd_net != &init_net) 1067 if (dev_net(dev) != &init_net)
1068 goto drop; 1068 goto drop;
1069 1069
1070 if (skb->pkt_type == PACKET_OTHERHOST) 1070 if (skb->pkt_type == PACKET_OTHERHOST)
@@ -1121,7 +1121,7 @@ static int econet_notifier(struct notifier_block *this, unsigned long msg, void
1121 struct net_device *dev = (struct net_device *)data; 1121 struct net_device *dev = (struct net_device *)data;
1122 struct ec_device *edev; 1122 struct ec_device *edev;
1123 1123
1124 if (dev->nd_net != &init_net) 1124 if (dev_net(dev) != &init_net)
1125 return NOTIFY_DONE; 1125 return NOTIFY_DONE;
1126 1126
1127 switch (msg) { 1127 switch (msg) {