aboutsummaryrefslogtreecommitdiffstats
path: root/net/can/af_can.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-03-25 08:47:49 -0400
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-03-25 15:39:53 -0400
commitc346dca10840a874240c78efe3f39acf4312a1f2 (patch)
treec04cff20124eba5cc337cc5ec260ad2513eeb065 /net/can/af_can.c
parent7cbca67c073263c179f605bdbbdc565ab29d801d (diff)
[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.
Introduce per-net_device inlines: dev_net(), dev_net_set(). Without CONFIG_NET_NS, no namespace other than &init_net exists. Let's explicitly define them to help compiler optimizations. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net/can/af_can.c')
-rw-r--r--net/can/af_can.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 36b9f22ed83a..2759b76f731c 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -599,7 +599,7 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev,
599 struct dev_rcv_lists *d; 599 struct dev_rcv_lists *d;
600 int matches; 600 int matches;
601 601
602 if (dev->type != ARPHRD_CAN || dev->nd_net != &init_net) { 602 if (dev->type != ARPHRD_CAN || dev_net(dev) != &init_net) {
603 kfree_skb(skb); 603 kfree_skb(skb);
604 return 0; 604 return 0;
605 } 605 }
@@ -710,7 +710,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
710 struct net_device *dev = (struct net_device *)data; 710 struct net_device *dev = (struct net_device *)data;
711 struct dev_rcv_lists *d; 711 struct dev_rcv_lists *d;
712 712
713 if (dev->nd_net != &init_net) 713 if (dev_net(dev) != &init_net)
714 return NOTIFY_DONE; 714 return NOTIFY_DONE;
715 715
716 if (dev->type != ARPHRD_CAN) 716 if (dev->type != ARPHRD_CAN)