diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-24 11:26:50 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 11:26:50 -0400 |
| commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
| tree | 962e068491b752a944f61c454fad3f8619a1ea3f /drivers/net/wan/lapbether.c | |
| parent | 076d8423a98659a92837b07aa494cb74bfefe77c (diff) | |
| parent | 3dc5063786b273f1aee545844f6bd4e9651ebffe (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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)) |