diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-07-20 01:34:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-20 01:34:43 -0400 |
commit | 721499e8931c5732202481ae24f2dfbf9910f129 (patch) | |
tree | c94d8d681966109bb41f712f21f3a9825ae2172d /net/appletalk | |
parent | 407d819cf0fd54c6fc1138a509225696aecafd15 (diff) |
netns: Use net_eq() to compare net-namespaces for optimization.
Without CONFIG_NET_NS, namespace is always &init_net.
Compiler will be able to omit namespace comparisons with this patch.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/appletalk')
-rw-r--r-- | net/appletalk/aarp.c | 4 | ||||
-rw-r--r-- | net/appletalk/ddp.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index 25aa37ce9430..b25c1e909d14 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c | |||
@@ -333,7 +333,7 @@ static int aarp_device_event(struct notifier_block *this, unsigned long event, | |||
333 | struct net_device *dev = ptr; | 333 | struct net_device *dev = ptr; |
334 | int ct; | 334 | int ct; |
335 | 335 | ||
336 | if (dev_net(dev) != &init_net) | 336 | if (!net_eq(dev_net(dev), &init_net)) |
337 | return NOTIFY_DONE; | 337 | return NOTIFY_DONE; |
338 | 338 | ||
339 | if (event == NETDEV_DOWN) { | 339 | if (event == NETDEV_DOWN) { |
@@ -716,7 +716,7 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev, | |||
716 | struct atalk_addr sa, *ma, da; | 716 | struct atalk_addr sa, *ma, da; |
717 | struct atalk_iface *ifa; | 717 | struct atalk_iface *ifa; |
718 | 718 | ||
719 | if (dev_net(dev) != &init_net) | 719 | if (!net_eq(dev_net(dev), &init_net)) |
720 | goto out0; | 720 | goto out0; |
721 | 721 | ||
722 | /* We only do Ethernet SNAP AARP. */ | 722 | /* We only do Ethernet SNAP AARP. */ |
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 44cd42f7786b..07b5b82c5eab 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_net(dev) != &init_net) | 651 | if (!net_eq(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_net(dev) != &init_net) | 1408 | if (!net_eq(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_net(dev) != &init_net) | 1496 | if (!net_eq(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 */ |