Commit bcf68ea1 authored by Nick Nunley's avatar Nick Nunley Committed by Tony Nguyen
Browse files

ice: Remove vlan_ena from vsi structure 



vlan_ena was introduced to track whether VLAN filters are enabled on
the device, but
1) checking for num_vlan > 1 already gives us this information, and is
currently used in this way throughout the code
2) the logic for vlan_ena is broken when multiple VLANs are active

Just remove vlan_ena and use num_vlan instead.

Signed-off-by: default avatarNick Nunley <nicholas.d.nunley@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 956542ca

drivers/net/ethernet/intel/ice/ice.h

+0 −1
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ struct ice_vsi { 
	u8 irqs_ready:1;

	u8 current_isup:1;		 /* Sync 'link up' logging */

	u8 stat_offsets_loaded:1;

	u8 vlan_ena:1;

	u16 num_vlan;



	/* queue information */

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

+4 −7
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int ice_cfg_promisc(struct ice_vsi *vsi, u8 promisc_m, bool set_promisc) 
	if (vsi->type != ICE_VSI_PF)

		return 0;



	if (vsi->vlan_ena) {

	if (vsi->num_vlan > 1) {

		status = ice_set_vlan_vsi_promisc(hw, vsi->idx, promisc_m,

						  set_promisc);

	} else {
@@ -326,7 +326,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) 
	/* check for changes in promiscuous modes */

	if (changed_flags & IFF_ALLMULTI) {

		if (vsi->current_netdev_flags & IFF_ALLMULTI) {

			if (vsi->vlan_ena)

			if (vsi->num_vlan > 1)

				promisc_m = ICE_MCAST_VLAN_PROMISC_BITS;

			else

				promisc_m = ICE_MCAST_PROMISC_BITS;
@@ -340,7 +340,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) 
			}

		} else {

			/* !(vsi->current_netdev_flags & IFF_ALLMULTI) */

			if (vsi->vlan_ena)

			if (vsi->num_vlan > 1)

				promisc_m = ICE_MCAST_VLAN_PROMISC_BITS;

			else

				promisc_m = ICE_MCAST_PROMISC_BITS;
@@ -3116,10 +3116,8 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto, 
	 * packets aren't pruned by the device's internal switch on Rx

	 */

	ret = ice_vsi_add_vlan(vsi, vid, ICE_FWD_TO_VSI);

	if (!ret) {

		vsi->vlan_ena = true;

	if (!ret)

		set_bit(ICE_VSI_FLAG_VLAN_FLTR_CHANGED, vsi->flags);

	}



	return ret;

}
@@ -3158,7 +3156,6 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto, 
	if (vsi->num_vlan == 1 && ice_vsi_is_vlan_pruning_ena(vsi))

		ret = ice_cfg_vlan_pruning(vsi, false, false);



	vsi->vlan_ena = false;

	set_bit(ICE_VSI_FLAG_VLAN_FLTR_CHANGED, vsi->flags);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE