diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wan/hdlc.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wan/hdlc.c')
| -rw-r--r-- | drivers/net/wan/hdlc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c index cc07236ea734..9937bbab938d 100644 --- a/drivers/net/wan/hdlc.c +++ b/drivers/net/wan/hdlc.c | |||
| @@ -57,7 +57,7 @@ static int hdlc_rcv(struct sk_buff *skb, struct net_device *dev, | |||
| 57 | { | 57 | { |
| 58 | struct hdlc_device *hdlc = dev_to_hdlc(dev); | 58 | struct hdlc_device *hdlc = dev_to_hdlc(dev); |
| 59 | 59 | ||
| 60 | if (dev_net(dev) != &init_net) { | 60 | if (!net_eq(dev_net(dev), &init_net)) { |
| 61 | kfree_skb(skb); | 61 | kfree_skb(skb); |
| 62 | return 0; | 62 | return 0; |
| 63 | } | 63 | } |
| @@ -102,7 +102,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event, | |||
| 102 | unsigned long flags; | 102 | unsigned long flags; |
| 103 | int on; | 103 | int on; |
| 104 | 104 | ||
| 105 | if (dev_net(dev) != &init_net) | 105 | if (!net_eq(dev_net(dev), &init_net)) |
| 106 | return NOTIFY_DONE; | 106 | return NOTIFY_DONE; |
| 107 | 107 | ||
| 108 | if (!(dev->priv_flags & IFF_WAN_HDLC)) | 108 | if (!(dev->priv_flags & IFF_WAN_HDLC)) |