3 files changed, 4 insertions, 8 deletions

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 5cacad0671db..7e9d22ec7d45 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -340,6 +340,7 @@ static int register_vlan_device(struct net_device *real_dev,
         if (new_dev == NULL)
                 return -ENOBUFS;
 
+        dev_net_set(new_dev, net);
         /* need 4 bytes for extra VLAN header info,
          * hope the underlying device can handle it.
          */
@@ -406,9 +407,6 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
         int i, flgs;
         struct net_device *vlandev;
 
-        if (dev_net(dev) != &init_net)
-                return NOTIFY_DONE;
-
         if (is_vlan_dev(dev)) {
                 __vlan_device_event(dev, event);
                 goto out;
@@ -534,7 +532,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
         case GET_VLAN_REALDEV_NAME_CMD:
         case GET_VLAN_VID_CMD:
                 err = -ENODEV;
-                dev = __dev_get_by_name(&init_net, args.device1);
+                dev = __dev_get_by_name(net, args.device1);
                 if (!dev)
                         goto out;
 
@@ -665,6 +663,7 @@ static void vlan_exit_net(struct net *net)
         struct vlan_net *vn;
 
         vn = net_generic(net, vlan_net_id);
+        rtnl_kill_links(net, &vlan_link_ops);
         vlan_proc_cleanup(net);
         kfree(vn);
 }
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 4ae0d7ef62c1..c961f0826005 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -153,9 +153,6 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
         struct net_device_stats *stats;
         unsigned short vlan_TCI;
 
-        if (dev_net(dev) != &init_net)
-                goto err_free;
-
         skb = skb_share_check(skb, GFP_ATOMIC);
         if (skb == NULL)
                 goto err_free;
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
index e32eeb37987e..c93e69ec28ed 100644
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -113,7 +113,7 @@ static int vlan_newlink(struct net_device *dev,
 
         if (!tb[IFLA_LINK])
                 return -EINVAL;
-        real_dev = __dev_get_by_index(&init_net, nla_get_u32(tb[IFLA_LINK]));
+        real_dev = __dev_get_by_index(dev_net(dev), nla_get_u32(tb[IFLA_LINK]));
         if (!real_dev)
                 return -ENODEV;