diff options
Diffstat (limited to 'net/8021q')
-rw-r--r-- | net/8021q/vlan.c | 2 | ||||
-rw-r--r-- | net/8021q/vlan_dev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index dbc81b965096..c35dc230365c 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -382,7 +382,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, | |||
382 | int i, flgs; | 382 | int i, flgs; |
383 | struct net_device *vlandev; | 383 | struct net_device *vlandev; |
384 | 384 | ||
385 | if (dev->nd_net != &init_net) | 385 | if (dev_net(dev) != &init_net) |
386 | return NOTIFY_DONE; | 386 | return NOTIFY_DONE; |
387 | 387 | ||
388 | if (!grp) | 388 | if (!grp) |
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 1e5c9904571d..e536162b1ebc 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -153,7 +153,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, | |||
153 | struct net_device_stats *stats; | 153 | struct net_device_stats *stats; |
154 | unsigned short vlan_TCI; | 154 | unsigned short vlan_TCI; |
155 | 155 | ||
156 | if (dev->nd_net != &init_net) | 156 | if (dev_net(dev) != &init_net) |
157 | goto err_free; | 157 | goto err_free; |
158 | 158 | ||
159 | skb = skb_share_check(skb, GFP_ATOMIC); | 159 | skb = skb_share_check(skb, GFP_ATOMIC); |