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

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

ice: Separate if conditions for ice_set_features() 



Set features can have multiple features turned on|off in a single
call.  Grouping these all in an if/else means after one condition
is met, other conditions/features will not be evaluated.  Break
the if/else statements by feature to ensure all features will be
handled properly.

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 a03499d6

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -2873,6 +2873,9 @@ ice_set_features(struct net_device *netdev, netdev_features_t features) 
	struct ice_vsi *vsi = np->vsi;

	struct ice_vsi *vsi = np->vsi;

	int ret = 0;

	int ret = 0;





	/* Multiple features can be changed in one call so keep features in

	 * separate if/else statements to guarantee each feature is checked

	 */

	if (features & NETIF_F_RXHASH && !(netdev->features & NETIF_F_RXHASH))

	if (features & NETIF_F_RXHASH && !(netdev->features & NETIF_F_RXHASH))

		ret = ice_vsi_manage_rss_lut(vsi, true);

		ret = ice_vsi_manage_rss_lut(vsi, true);

	else if (!(features & NETIF_F_RXHASH) &&

	else if (!(features & NETIF_F_RXHASH) &&
@@ -2885,7 +2888,8 @@ ice_set_features(struct net_device *netdev, netdev_features_t features) 
	else if (!(features & NETIF_F_HW_VLAN_CTAG_RX) &&

	else if (!(features & NETIF_F_HW_VLAN_CTAG_RX) &&

		 (netdev->features & NETIF_F_HW_VLAN_CTAG_RX))

		 (netdev->features & NETIF_F_HW_VLAN_CTAG_RX))

		ret = ice_vsi_manage_vlan_stripping(vsi, false);

		ret = ice_vsi_manage_vlan_stripping(vsi, false);

	else if ((features & NETIF_F_HW_VLAN_CTAG_TX) &&



	if ((features & NETIF_F_HW_VLAN_CTAG_TX) &&

	    !(netdev->features & NETIF_F_HW_VLAN_CTAG_TX))

	    !(netdev->features & NETIF_F_HW_VLAN_CTAG_TX))

		ret = ice_vsi_manage_vlan_insertion(vsi);

		ret = ice_vsi_manage_vlan_insertion(vsi);

	else if (!(features & NETIF_F_HW_VLAN_CTAG_TX) &&

	else if (!(features & NETIF_F_HW_VLAN_CTAG_TX) &&