| From 889fefe7c691093563b96c0dee3d4a8aa707ad14 Mon Sep 17 00:00:00 2001 |
| From: Tony Nguyen <anthony.l.nguyen@intel.com> |
| Date: Tue, 16 Apr 2019 10:21:23 -0700 |
| Subject: ice: Separate if conditions for ice_set_features() |
| |
| [ Upstream commit 8f529ff912073f778e3cd74e87fb69a36499fc2f ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/ice/ice_main.c | 8 ++++++-- |
| 1 file 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 47cc3f905b7ff..ac30288720f71 100644 |
| --- a/drivers/net/ethernet/intel/ice/ice_main.c |
| +++ b/drivers/net/ethernet/intel/ice/ice_main.c |
| @@ -2545,6 +2545,9 @@ static int ice_set_features(struct net_device *netdev, |
| 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) && |
| @@ -2557,8 +2560,9 @@ static int ice_set_features(struct net_device *netdev, |
| 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)) |
| -- |
| 2.20.1 |
| |