1 files changed, 15 insertions, 9 deletions

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 44ebd5c2cd4a..64c6bed4a3d3 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -250,7 +250,8 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)
                 snprintf(name, IFNAMSIZ, "vlan%.4i", vlan_id);
         }
 
-        new_dev = alloc_netdev(sizeof(struct vlan_dev_priv), name, vlan_setup);
+        new_dev = alloc_netdev(sizeof(struct vlan_dev_priv), name,
+                               NET_NAME_UNKNOWN, vlan_setup);
 
         if (new_dev == NULL)
                 return -ENOBUFS;
@@ -324,23 +325,24 @@ static void vlan_transfer_features(struct net_device *dev,
         netdev_update_features(vlandev);
 }
 
-static void __vlan_device_event(struct net_device *dev, unsigned long event)
+static int __vlan_device_event(struct net_device *dev, unsigned long event)
 {
+        int err = 0;
+
         switch (event) {
         case NETDEV_CHANGENAME:
                 vlan_proc_rem_dev(dev);
-                if (vlan_proc_add_dev(dev) < 0)
-                        pr_warn("failed to change proc name for %s\n",
-                                dev->name);
+                err = vlan_proc_add_dev(dev);
                 break;
         case NETDEV_REGISTER:
-                if (vlan_proc_add_dev(dev) < 0)
-                        pr_warn("failed to add proc entry for %s\n", dev->name);
+                err = vlan_proc_add_dev(dev);
                 break;
         case NETDEV_UNREGISTER:
                 vlan_proc_rem_dev(dev);
                 break;
         }
+
+        return err;
 }
 
 static int vlan_device_event(struct notifier_block *unused, unsigned long event,
@@ -355,8 +357,12 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
         bool last = false;
         LIST_HEAD(list);
 
-        if (is_vlan_dev(dev))
-                __vlan_device_event(dev, event);
+        if (is_vlan_dev(dev)) {
+                int err = __vlan_device_event(dev, event);
+
+                if (err)
+                        return notifier_from_errno(err);
+        }
 
         if ((event == NETDEV_UP) &&
             (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) {