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

Commit 146d4cc9 authored by John Fastabend's avatar John Fastabend Committed by Jeff Kirsher
Browse files

ixgbe: fix_features rxvlan is independent of DCB and needs to be set 



DCB can be used independent of if RX VLAN stripping is enabled
or disabled so remove erroneous check.

Also enable or disable VLAN stripping when features are applied so
hardware and feature flags are in sync.

CC: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarMarcus Dennis <marcusx.e.dennis@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 470a5420

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+5 −10
Original line number Diff line number Diff line
@@ -3607,10 +3607,6 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter) 
	if (hw->mac.type == ixgbe_mac_82598EB)

		netif_set_gso_max_size(adapter->netdev, 32768);





	/* Enable VLAN tag insert/strip */

	adapter->netdev->features |= NETIF_F_HW_VLAN_RX;



	hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);



#ifdef IXGBE_FCOE
@@ -6701,11 +6697,6 @@ static netdev_features_t ixgbe_fix_features(struct net_device *netdev, 
{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);



#ifdef CONFIG_DCB

	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)

		features &= ~NETIF_F_HW_VLAN_RX;

#endif



	/* return error if RXHASH is being enabled when RSS is not supported */

	if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED))

		features &= ~NETIF_F_RXHASH;
@@ -6718,7 +6709,6 @@ static netdev_features_t ixgbe_fix_features(struct net_device *netdev, 
	if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE))

		features &= ~NETIF_F_LRO;





	return features;

}
@@ -6766,6 +6756,11 @@ static int ixgbe_set_features(struct net_device *netdev, 
		need_reset = true;

	}



	if (features & NETIF_F_HW_VLAN_RX)

		ixgbe_vlan_strip_enable(adapter);

	else

		ixgbe_vlan_strip_disable(adapter);



	if (changed & NETIF_F_RXALL)

		need_reset = true;