diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-07-19 22:34:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-19 22:34:43 -0700 |
| commit | 721499e8931c5732202481ae24f2dfbf9910f129 (patch) | |
| tree | c94d8d681966109bb41f712f21f3a9825ae2172d /net/x25 | |
| parent | 407d819cf0fd54c6fc1138a509225696aecafd15 (diff) | |
| download | linux-stable-721499e8931c5732202481ae24f2dfbf9910f129.tar.gz linux-stable-721499e8931c5732202481ae24f2dfbf9910f129.tar.bz2 linux-stable-721499e8931c5732202481ae24f2dfbf9910f129.zip | |
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/x25')
| -rw-r--r-- | net/x25/af_x25.c | 2 | ||||
| -rw-r--r-- | net/x25/x25_dev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 7b1c6ef04553..9fc5b023d111 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -191,7 +191,7 @@ static int x25_device_event(struct notifier_block *this, unsigned long event, struct net_device *dev = ptr; struct x25_neigh *nb; - if (dev_net(dev) != &init_net) + if (!net_eq(dev_net(dev), &init_net)) return NOTIFY_DONE; if (dev->type == ARPHRD_X25 diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c index 3ff206c0ae94..3e1efe534645 100644 --- a/net/x25/x25_dev.c +++ b/net/x25/x25_dev.c @@ -95,7 +95,7 @@ int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev, struct sk_buff *nskb; struct x25_neigh *nb; - if (dev_net(dev) != &init_net) + if (!net_eq(dev_net(dev), &init_net)) goto drop; nskb = skb_copy(skb, GFP_ATOMIC); |