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/can | |
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/can')
-rw-r--r-- | net/can/af_can.c | 4 | ||||
-rw-r--r-- | net/can/bcm.c | 2 | ||||
-rw-r--r-- | net/can/raw.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 484bbf6dd03..8035fbf526a 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
@@ -615,7 +615,7 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev, | |||
615 | struct can_frame *cf = (struct can_frame *)skb->data; | 615 | struct can_frame *cf = (struct can_frame *)skb->data; |
616 | int matches; | 616 | int matches; |
617 | 617 | ||
618 | if (dev->type != ARPHRD_CAN || dev_net(dev) != &init_net) { | 618 | if (dev->type != ARPHRD_CAN || !net_eq(dev_net(dev), &init_net)) { |
619 | kfree_skb(skb); | 619 | kfree_skb(skb); |
620 | return 0; | 620 | return 0; |
621 | } | 621 | } |
@@ -728,7 +728,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, | |||
728 | struct net_device *dev = (struct net_device *)data; | 728 | struct net_device *dev = (struct net_device *)data; |
729 | struct dev_rcv_lists *d; | 729 | struct dev_rcv_lists *d; |
730 | 730 | ||
731 | if (dev_net(dev) != &init_net) | 731 | if (!net_eq(dev_net(dev), &init_net)) |
732 | return NOTIFY_DONE; | 732 | return NOTIFY_DONE; |
733 | 733 | ||
734 | if (dev->type != ARPHRD_CAN) | 734 | if (dev->type != ARPHRD_CAN) |
diff --git a/net/can/bcm.c b/net/can/bcm.c index 72c2ce904f8..d0dd382001e 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
@@ -1303,7 +1303,7 @@ static int bcm_notifier(struct notifier_block *nb, unsigned long msg, | |||
1303 | struct bcm_op *op; | 1303 | struct bcm_op *op; |
1304 | int notify_enodev = 0; | 1304 | int notify_enodev = 0; |
1305 | 1305 | ||
1306 | if (dev_net(dev) != &init_net) | 1306 | if (!net_eq(dev_net(dev), &init_net)) |
1307 | return NOTIFY_DONE; | 1307 | return NOTIFY_DONE; |
1308 | 1308 | ||
1309 | if (dev->type != ARPHRD_CAN) | 1309 | if (dev->type != ARPHRD_CAN) |
diff --git a/net/can/raw.c b/net/can/raw.c index 3e46ee36a1a..6e0663faaf9 100644 --- a/net/can/raw.c +++ b/net/can/raw.c | |||
@@ -210,7 +210,7 @@ static int raw_notifier(struct notifier_block *nb, | |||
210 | struct raw_sock *ro = container_of(nb, struct raw_sock, notifier); | 210 | struct raw_sock *ro = container_of(nb, struct raw_sock, notifier); |
211 | struct sock *sk = &ro->sk; | 211 | struct sock *sk = &ro->sk; |
212 | 212 | ||
213 | if (dev_net(dev) != &init_net) | 213 | if (!net_eq(dev_net(dev), &init_net)) |
214 | return NOTIFY_DONE; | 214 | return NOTIFY_DONE; |
215 | 215 | ||
216 | if (dev->type != ARPHRD_CAN) | 216 | if (dev->type != ARPHRD_CAN) |