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: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 2352b4129a62..aa832d9b2458 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2873,6 +2873,9 @@ ice_set_features(struct net_device *netdev, netdev_features_t features)
         struct ice_vsi *vsi = np->vsi;
         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))
                 ret = ice_vsi_manage_rss_lut(vsi, true);
         else if (!(features & NETIF_F_RXHASH) &&
@@ -2885,8 +2888,9 @@ ice_set_features(struct net_device *netdev, netdev_features_t features)
         else if (!(features & NETIF_F_HW_VLAN_CTAG_RX) &&
                  (netdev->features & NETIF_F_HW_VLAN_CTAG_RX))
                 ret = ice_vsi_manage_vlan_stripping(vsi, false);
-        else if ((features & NETIF_F_HW_VLAN_CTAG_TX) &&
-                 !(netdev->features & NETIF_F_HW_VLAN_CTAG_TX))
+
+        if ((features & NETIF_F_HW_VLAN_CTAG_TX) &&
+            !(netdev->features & NETIF_F_HW_VLAN_CTAG_TX))
                 ret = ice_vsi_manage_vlan_insertion(vsi);
         else if (!(features & NETIF_F_HW_VLAN_CTAG_TX) &&
                  (netdev->features & NETIF_F_HW_VLAN_CTAG_TX))