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/ax25 | |
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/ax25')
-rw-r--r-- | net/ax25/af_ax25.c | 2 | ||||
-rw-r--r-- | net/ax25/ax25_in.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 97eaa23ad9ea..01c83e2a4c19 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
@@ -116,7 +116,7 @@ static int ax25_device_event(struct notifier_block *this, unsigned long event, | |||
116 | { | 116 | { |
117 | struct net_device *dev = (struct net_device *)ptr; | 117 | struct net_device *dev = (struct net_device *)ptr; |
118 | 118 | ||
119 | if (dev_net(dev) != &init_net) | 119 | if (!net_eq(dev_net(dev), &init_net)) |
120 | return NOTIFY_DONE; | 120 | return NOTIFY_DONE; |
121 | 121 | ||
122 | /* Reject non AX.25 devices */ | 122 | /* Reject non AX.25 devices */ |
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 33790a8efbc8..4a5ba978a804 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c | |||
@@ -451,7 +451,7 @@ int ax25_kiss_rcv(struct sk_buff *skb, struct net_device *dev, | |||
451 | skb->sk = NULL; /* Initially we don't know who it's for */ | 451 | skb->sk = NULL; /* Initially we don't know who it's for */ |
452 | skb->destructor = NULL; /* Who initializes this, dammit?! */ | 452 | skb->destructor = NULL; /* Who initializes this, dammit?! */ |
453 | 453 | ||
454 | if (dev_net(dev) != &init_net) { | 454 | if (!net_eq(dev_net(dev), &init_net)) { |
455 | kfree_skb(skb); | 455 | kfree_skb(skb); |
456 | return 0; | 456 | return 0; |
457 | } | 457 | } |