lkml.org 
[lkml]   [2019]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 130/241] i40e: dont allow changes to HW VLAN stripping on active port VLANs
    Date
    [ 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 06b38f50980c5..22c43a776c6cd 100644
    --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
    +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
    @@ -2263,6 +2263,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))
    @@ -2293,6 +2297,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


    \
     
     \ /
      Last update: 2019-06-09 19:11    [W:4.154 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site