2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 0a7ea4c5f9d3..a5f2660d552d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -7549,6 +7549,11 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
         if (!(pf->flags & I40E_FLAG_SRIOV_ENABLED))
                 return -EOPNOTSUPP;
 
+        if (vid) {
+                pr_info("%s: vlans aren't supported yet for dev_uc|mc_add()\n", dev->name);
+                return -EINVAL;
+        }
+
         /* Hardware does not support aging addresses so if a
          * ndm_state is given only allow permanent addresses
          */
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index d06107d36ec8..9cf6fe9ddc0c 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2368,6 +2368,11 @@ int ndo_dflt_fdb_add(struct ndmsg *ndm,
                 return err;
         }
 
+        if (vid) {
+                pr_info("%s: vlans aren't supported yet for dev_uc|mc_add()\n", dev->name);
+                return err;
+        }
+
         if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr))
                 err = dev_uc_add_excl(dev, addr);
         else if (is_multicast_ether_addr(addr))