|
@@ -2076,6 +2076,11 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
|
|
goto error_pvid;
|
|
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) {
|
|
if (vsi->info.pvid) {
|
|
/* kill old VLAN */
|
|
/* kill old VLAN */
|
|
ret = i40e_vsi_kill_vlan(vsi, (le16_to_cpu(vsi->info.pvid) &
|
|
ret = i40e_vsi_kill_vlan(vsi, (le16_to_cpu(vsi->info.pvid) &
|