diff options
Diffstat (limited to 'drivers/net/pppoe.c')
-rw-r--r-- | drivers/net/pppoe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index ac0ac98b19cd..4fad4ddb3504 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
@@ -301,7 +301,7 @@ static int pppoe_device_event(struct notifier_block *this, | |||
301 | { | 301 | { |
302 | struct net_device *dev = (struct net_device *) ptr; | 302 | struct net_device *dev = (struct net_device *) ptr; |
303 | 303 | ||
304 | if (dev->nd_net != &init_net) | 304 | if (dev_net(dev) != &init_net) |
305 | return NOTIFY_DONE; | 305 | return NOTIFY_DONE; |
306 | 306 | ||
307 | /* Only look at sockets that are using this specific device. */ | 307 | /* Only look at sockets that are using this specific device. */ |
@@ -392,7 +392,7 @@ static int pppoe_rcv(struct sk_buff *skb, | |||
392 | if (!(skb = skb_share_check(skb, GFP_ATOMIC))) | 392 | if (!(skb = skb_share_check(skb, GFP_ATOMIC))) |
393 | goto out; | 393 | goto out; |
394 | 394 | ||
395 | if (dev->nd_net != &init_net) | 395 | if (dev_net(dev) != &init_net) |
396 | goto drop; | 396 | goto drop; |
397 | 397 | ||
398 | if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) | 398 | if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) |
@@ -424,7 +424,7 @@ static int pppoe_disc_rcv(struct sk_buff *skb, | |||
424 | struct pppoe_hdr *ph; | 424 | struct pppoe_hdr *ph; |
425 | struct pppox_sock *po; | 425 | struct pppox_sock *po; |
426 | 426 | ||
427 | if (dev->nd_net != &init_net) | 427 | if (dev_net(dev) != &init_net) |
428 | goto abort; | 428 | goto abort; |
429 | 429 | ||
430 | if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) | 430 | if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) |