diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /drivers/net/wan/lapbether.c | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'drivers/net/wan/lapbether.c')
| -rw-r--r-- | drivers/net/wan/lapbether.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 824df3b5ea49..b5860b97a93e 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c | |||
| @@ -91,7 +91,7 @@ static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packe | |||
| 91 | int len, err; | 91 | int len, err; |
| 92 | struct lapbethdev *lapbeth; | 92 | struct lapbethdev *lapbeth; |
| 93 | 93 | ||
| 94 | if (dev->nd_net != &init_net) | 94 | if (dev_net(dev) != &init_net) |
| 95 | goto drop; | 95 | goto drop; |
| 96 | 96 | ||
| 97 | if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) | 97 | if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) |
| @@ -393,7 +393,7 @@ static int lapbeth_device_event(struct notifier_block *this, | |||
| 393 | struct lapbethdev *lapbeth; | 393 | struct lapbethdev *lapbeth; |
| 394 | struct net_device *dev = ptr; | 394 | struct net_device *dev = ptr; |
| 395 | 395 | ||
| 396 | if (dev->nd_net != &init_net) | 396 | if (dev_net(dev) != &init_net) |
| 397 | return NOTIFY_DONE; | 397 | return NOTIFY_DONE; |
| 398 | 398 | ||
| 399 | if (!dev_is_ethdev(dev)) | 399 | if (!dev_is_ethdev(dev)) |