i40evf: Allow turning off offloads when the VF has VLAN set

This patch adds back the capability to turn off offloads when VF has
VLAN set. The commit 0a3b4f702fb1 ("i40evf: enable support for VF VLAN
tag stripping control") adds the i40evf_set_features function and
changes the 'turn off' flow for offloads. This patch adds that
capability back by moving checking the VLAN option for VF to the
next statement.

Signed-off-by: Paweł Jabłoński <pawel.jablonski@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 8934f784e96fd63106fae4853fef9de7ed02d481..d59bf060196b6b36267edfa78d5b93a5930cb09e 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2344,13 +2344,19 @@ static int i40evf_set_features(struct net_device *netdev,
 {
        struct i40evf_adapter *adapter = netdev_priv(netdev);
 
-       if (!VLAN_ALLOWED(adapter))
+       /* Don't allow changing VLAN_RX flag when VLAN is set for VF
+        * and return an error in this case
+        */
+       if (VLAN_ALLOWED(adapter)) {
+               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;
-
-       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;
+       }
 
        return 0;
 }