1 files changed, 8 insertions, 3 deletions

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 5505ee6ebdbe..73a65789271b 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -118,17 +118,21 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
 }
 
 int vlan_check_real_dev(struct net_device *real_dev,
-                        __be16 protocol, u16 vlan_id)
+                        __be16 protocol, u16 vlan_id,
+                        struct netlink_ext_ack *extack)
 {
         const char *name = real_dev->name;
 
         if (real_dev->features & NETIF_F_VLAN_CHALLENGED) {
                 pr_info("VLANs not supported on %s\n", name);
+                NL_SET_ERR_MSG_MOD(extack, "VLANs not supported on device");
                 return -EOPNOTSUPP;
         }
 
-        if (vlan_find_dev(real_dev, protocol, vlan_id) != NULL)
+        if (vlan_find_dev(real_dev, protocol, vlan_id) != NULL) {
+                NL_SET_ERR_MSG_MOD(extack, "VLAN device already exists");
                 return -EEXIST;
+        }
 
         return 0;
 }
@@ -215,7 +219,8 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)
         if (vlan_id >= VLAN_VID_MASK)
                 return -ERANGE;
 
-        err = vlan_check_real_dev(real_dev, htons(ETH_P_8021Q), vlan_id);
+        err = vlan_check_real_dev(real_dev, htons(ETH_P_8021Q), vlan_id,
+                                  NULL);
         if (err < 0)
                 return err;