i40evf: Don't enable vlan stripping when rx offload is turned on

[ Upstream commit 3bd77e2ae1477d6f87fc3f542c737119d5decf9f ]

With current implementation of i40evf_set_features when user sets
any offload via ethtool we set I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING
as a required aq which triggers driver to call
i40evf_enable_vlan_stripping. This shouldn't take place.
This patches fixes it by setting the flag only when VLAN offload
is turned on.

Signed-off-by: Patryk Małek <patryk.malek@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>

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index bc4fa9d..3fc46d2 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -3097,18 +3097,19 @@ static int i40evf_set_features(struct net_device *netdev,
 {
        struct i40evf_adapter *adapter = netdev_priv(netdev);
 
-       /* Don't allow changing VLAN_RX flag when VLAN is set for VF
-        * and return an error in this case
+       /* Don't allow changing VLAN_RX flag when adapter is not capable
+        * of VLAN offload
         */
-       if (VLAN_ALLOWED(adapter)) {
+       if (!VLAN_ALLOWED(adapter)) {
+               if ((netdev->features ^ features) & NETIF_F_HW_VLAN_CTAG_RX)
+                       return -EINVAL;
+       } else if ((netdev->features ^ features) & NETIF_F_HW_VLAN_CTAG_RX) {
                if (features & NETIF_F_HW_VLAN_CTAG_RX)
                        adapter->aq_required |=
                                I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING;
                else
                        adapter->aq_required |=
                                I40EVF_FLAG_AQ_DISABLE_VLAN_STRIPPING;
-       } else if ((netdev->features ^ features) & NETIF_F_HW_VLAN_CTAG_RX) {
-               return -EINVAL;
        }
 
        return 0;