| From c0cd7a646810499a293cb8f84deb367c0ab83956 Mon Sep 17 00:00:00 2001 |
| From: Nicholas Nunley <nicholas.d.nunley@intel.com> |
| Date: Wed, 6 Feb 2019 15:08:17 -0800 |
| Subject: i40e: don't allow changes to HW VLAN stripping on active port VLANs |
| |
| [ Upstream commit bfb0ebed53857cfc57f11c63fa3689940d71c1c8 ] |
| |
| Modifying the VLAN stripping options when a port VLAN is configured |
| will break traffic for the VSI, and conceptually doesn't make sense, |
| so don't allow this. |
| |
| Signed-off-by: Nicholas Nunley <nicholas.d.nunley@intel.com> |
| Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| |
| diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c |
| index b1c265012c8ad..ac9fcb0976890 100644 |
| --- a/drivers/net/ethernet/intel/i40e/i40e_main.c |
| +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c |
| @@ -2654,6 +2654,10 @@ void i40e_vlan_stripping_enable(struct i40e_vsi *vsi) |
| struct i40e_vsi_context ctxt; |
| i40e_status ret; |
| |
| + /* Don't modify stripping options if a port VLAN is active */ |
| + if (vsi->info.pvid) |
| + return; |
| + |
| if ((vsi->info.valid_sections & |
| cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID)) && |
| ((vsi->info.port_vlan_flags & I40E_AQ_VSI_PVLAN_MODE_MASK) == 0)) |
| @@ -2684,6 +2688,10 @@ void i40e_vlan_stripping_disable(struct i40e_vsi *vsi) |
| struct i40e_vsi_context ctxt; |
| i40e_status ret; |
| |
| + /* Don't modify stripping options if a port VLAN is active */ |
| + if (vsi->info.pvid) |
| + return; |
| + |
| if ((vsi->info.valid_sections & |
| cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID)) && |
| ((vsi->info.port_vlan_flags & I40E_AQ_VSI_PVLAN_EMOD_MASK) == |
| -- |
| 2.20.1 |
| |
