i40e: Warn admin to reload VF driver on port VLAN configuration

[linux-2.6-block.git] / drivers / net / ethernet / intel / i40e / i40e_virtchnl_pf.c

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 53069c0dffd5bebf769c59612d106c8656fba6f2..869b4fb991fc8d63cce858bfde53cf61749fed8d 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -2076,6 +2076,11 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
                goto error_pvid;
        }
 
+       if (vsi->info.pvid == 0 && i40e_is_vsi_in_vlan(vsi))
+               dev_err(&pf->pdev->dev,
+                       "VF %d has already configured VLAN filters and the administrator is requesting a port VLAN override.\nPlease unload and reload the VF driver for this change to take effect.\n",
+                       vf_id);
+
        if (vsi->info.pvid) {
                /* kill old VLAN */
                ret = i40e_vsi_kill_vlan(vsi, (le16_to_cpu(vsi->info.pvid) &