Commit 6ab11557 authored by Wojciech Drewek's avatar Wojciech Drewek Committed by Tony Nguyen
Browse files

ice: Disable vlan pruning for uplink VSI 



In switchdev mode, uplink VSI is configured to be default
VSI which means it will receive all unmatched packets.
In order to receive vlan packets we need to disable vlan pruning
as well. This is done by dis_rx_filtering vlan op.

Reviewed-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Tested-by: default avatarSujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 7aa529a6

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

+10 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ static int ice_eswitch_setup_env(struct ice_pf *pf) 
		rule_added = true;

	}



	vlan_ops = ice_get_compat_vsi_vlan_ops(uplink_vsi);

	if (vlan_ops->dis_rx_filtering(uplink_vsi))

		goto err_dis_rx;



	if (ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_set_allow_override))

		goto err_override_uplink;
@@ -114,6 +118,8 @@ static int ice_eswitch_setup_env(struct ice_pf *pf) 
err_override_control:

	ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_clear_allow_override);

err_override_uplink:

	vlan_ops->ena_rx_filtering(uplink_vsi);

err_dis_rx:

	if (rule_added)

		ice_clear_dflt_vsi(uplink_vsi);

err_def_rx:
@@ -381,9 +387,13 @@ static void ice_eswitch_release_env(struct ice_pf *pf) 
{

	struct ice_vsi *uplink_vsi = pf->switchdev.uplink_vsi;

	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;

	struct ice_vsi_vlan_ops *vlan_ops;



	vlan_ops = ice_get_compat_vsi_vlan_ops(uplink_vsi);



	ice_vsi_update_security(ctrl_vsi, ice_vsi_ctx_clear_allow_override);

	ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_clear_allow_override);

	vlan_ops->ena_rx_filtering(uplink_vsi);

	ice_clear_dflt_vsi(uplink_vsi);

	ice_fltr_add_mac_and_broadcast(uplink_vsi,

				       uplink_vsi->port_info->mac.perm_addr,