Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e80e76db authored by Tony Nguyen's avatar Tony Nguyen Committed by Jeff Kirsher
Browse files

ice: Preserve VLAN Rx stripping settings 



When Tx insertion is set, we are not accounting for the state of Rx
stripping.  This causes Rx stripping to be enabled any time Tx
insertion is changed, even when it's supposed to be disabled.

Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a52db6b2

drivers/net/ethernet/intel/ice/ice_lib.c

+4 −0
Original line number Diff line number Diff line
@@ -1932,6 +1932,10 @@ int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi) 
	 */

	ctxt->info.vlan_flags = ICE_AQ_VSI_VLAN_MODE_ALL;



	/* Preserve existing VLAN strip setting */

	ctxt->info.vlan_flags |= (vsi->info.vlan_flags &

				  ICE_AQ_VSI_VLAN_EMOD_M);



	ctxt->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID);



	status = ice_update_vsi(hw, vsi->idx, ctxt, NULL);