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/ipv6 | |
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/ipv6')
-rw-r--r-- | net/ipv6/ip6mr.c | 2 | ||||
-rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 2 | ||||
-rw-r--r-- | net/ipv6/proc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 0b41aa2675f5..095bc453ff4c 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
@@ -935,7 +935,7 @@ static int ip6mr_device_event(struct notifier_block *this, | |||
935 | struct mif_device *v; | 935 | struct mif_device *v; |
936 | int ct; | 936 | int ct; |
937 | 937 | ||
938 | if (dev_net(dev) != &init_net) | 938 | if (!net_eq(dev_net(dev), &init_net)) |
939 | return NOTIFY_DONE; | 939 | return NOTIFY_DONE; |
940 | 940 | ||
941 | if (event != NETDEV_UNREGISTER) | 941 | if (event != NETDEV_UNREGISTER) |
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index 1b8815f6153d..5859c046cbc4 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c | |||
@@ -480,7 +480,7 @@ ipq_rcv_dev_event(struct notifier_block *this, | |||
480 | { | 480 | { |
481 | struct net_device *dev = ptr; | 481 | struct net_device *dev = ptr; |
482 | 482 | ||
483 | if (dev_net(dev) != &init_net) | 483 | if (!net_eq(dev_net(dev), &init_net)) |
484 | return NOTIFY_DONE; | 484 | return NOTIFY_DONE; |
485 | 485 | ||
486 | /* Drop any packets associated with the downed device */ | 486 | /* Drop any packets associated with the downed device */ |
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index 70940b3654a1..f82f6074cf85 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
@@ -214,7 +214,7 @@ int snmp6_register_dev(struct inet6_dev *idev) | |||
214 | if (!idev || !idev->dev) | 214 | if (!idev || !idev->dev) |
215 | return -EINVAL; | 215 | return -EINVAL; |
216 | 216 | ||
217 | if (dev_net(idev->dev) != &init_net) | 217 | if (!net_eq(dev_net(idev->dev), &init_net)) |
218 | return 0; | 218 | return 0; |
219 | 219 | ||
220 | if (!proc_net_devsnmp6) | 220 | if (!proc_net_devsnmp6) |