diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-25 08:47:49 -0400 |
---|---|---|
committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-25 15:39:53 -0400 |
commit | c346dca10840a874240c78efe3f39acf4312a1f2 (patch) | |
tree | c04cff20124eba5cc337cc5ec260ad2513eeb065 /net/appletalk/ddp.c | |
parent | 7cbca67c073263c179f605bdbbdc565ab29d801d (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/appletalk/ddp.c')
-rw-r--r-- | net/appletalk/ddp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 3be55c8ca4e..44cd42f7786 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c | |||
@@ -648,7 +648,7 @@ static int ddp_device_event(struct notifier_block *this, unsigned long event, | |||
648 | { | 648 | { |
649 | struct net_device *dev = ptr; | 649 | struct net_device *dev = ptr; |
650 | 650 | ||
651 | if (dev->nd_net != &init_net) | 651 | if (dev_net(dev) != &init_net) |
652 | return NOTIFY_DONE; | 652 | return NOTIFY_DONE; |
653 | 653 | ||
654 | if (event == NETDEV_DOWN) | 654 | if (event == NETDEV_DOWN) |
@@ -1405,7 +1405,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, | |||
1405 | int origlen; | 1405 | int origlen; |
1406 | __u16 len_hops; | 1406 | __u16 len_hops; |
1407 | 1407 | ||
1408 | if (dev->nd_net != &init_net) | 1408 | if (dev_net(dev) != &init_net) |
1409 | goto freeit; | 1409 | goto freeit; |
1410 | 1410 | ||
1411 | /* Don't mangle buffer if shared */ | 1411 | /* Don't mangle buffer if shared */ |
@@ -1493,7 +1493,7 @@ freeit: | |||
1493 | static int ltalk_rcv(struct sk_buff *skb, struct net_device *dev, | 1493 | static int ltalk_rcv(struct sk_buff *skb, struct net_device *dev, |
1494 | struct packet_type *pt, struct net_device *orig_dev) | 1494 | struct packet_type *pt, struct net_device *orig_dev) |
1495 | { | 1495 | { |
1496 | if (dev->nd_net != &init_net) | 1496 | if (dev_net(dev) != &init_net) |
1497 | goto freeit; | 1497 | goto freeit; |
1498 | 1498 | ||
1499 | /* Expand any short form frames */ | 1499 | /* Expand any short form frames */ |