diff options
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 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) |
diff --git a/net/can/bcm.c b/net/can/bcm.c index bd4282dae754..e9f99b2c6bc9 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
@@ -1285,7 +1285,7 @@ static int bcm_notifier(struct notifier_block *nb, unsigned long msg, | |||
1285 | struct bcm_op *op; | 1285 | struct bcm_op *op; |
1286 | int notify_enodev = 0; | 1286 | int notify_enodev = 0; |
1287 | 1287 | ||
1288 | if (dev->nd_net != &init_net) | 1288 | if (dev_net(dev) != &init_net) |
1289 | return NOTIFY_DONE; | 1289 | return NOTIFY_DONE; |
1290 | 1290 | ||
1291 | if (dev->type != ARPHRD_CAN) | 1291 | if (dev->type != ARPHRD_CAN) |
diff --git a/net/can/raw.c b/net/can/raw.c index 94cd7f27c444..ead50c7c0d40 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->nd_net != &init_net) | 213 | if (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) |