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/econet/af_econet.c | |
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/econet/af_econet.c')
-rw-r--r-- | net/econet/af_econet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c index d35127bb84e1..8789d2bb1b06 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c | |||
@@ -1062,7 +1062,7 @@ static int econet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet | |||
1062 | struct sock *sk; | 1062 | struct sock *sk; |
1063 | struct ec_device *edev = dev->ec_ptr; | 1063 | struct ec_device *edev = dev->ec_ptr; |
1064 | 1064 | ||
1065 | if (dev_net(dev) != &init_net) | 1065 | if (!net_eq(dev_net(dev), &init_net)) |
1066 | goto drop; | 1066 | goto drop; |
1067 | 1067 | ||
1068 | if (skb->pkt_type == PACKET_OTHERHOST) | 1068 | if (skb->pkt_type == PACKET_OTHERHOST) |
@@ -1119,7 +1119,7 @@ static int econet_notifier(struct notifier_block *this, unsigned long msg, void | |||
1119 | struct net_device *dev = (struct net_device *)data; | 1119 | struct net_device *dev = (struct net_device *)data; |
1120 | struct ec_device *edev; | 1120 | struct ec_device *edev; |
1121 | 1121 | ||
1122 | if (dev_net(dev) != &init_net) | 1122 | if (!net_eq(dev_net(dev), &init_net)) |
1123 | return NOTIFY_DONE; | 1123 | return NOTIFY_DONE; |
1124 | 1124 | ||
1125 | switch (msg) { | 1125 | switch (msg) { |