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

Commit 5eee87cd authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Fix VLAN features error 



It looks like at some point I somehow transposed the location of setting
the VLAN features in netdev->features and the configuration of the
vlan_features.  As a result the driver is now generating a warning about
vlan_features being setup incorrectly.

This patch corrects that by placing the update of netdev->features to
include the VLAN features so that it is after the point where we write
netdev->features into netdev->vlan_features.

Fixes: b83e3010 ("ixgbe/ixgbevf: Add support for GSO partial")
Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 11f2b494

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

+4 −4
Original line number Diff line number Diff line
@@ -9508,15 +9508,15 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (pci_using_dac)

		netdev->features |= NETIF_F_HIGHDMA;



	netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID;

	netdev->hw_enc_features |= netdev->vlan_features;

	netdev->mpls_features |= NETIF_F_HW_CSUM;



	/* set this bit last since it cannot be part of vlan_features */

	netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER |

			    NETIF_F_HW_VLAN_CTAG_RX |

			    NETIF_F_HW_VLAN_CTAG_TX;



	netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID;

	netdev->hw_enc_features |= netdev->vlan_features;

	netdev->mpls_features |= NETIF_F_HW_CSUM;



	netdev->priv_flags |= IFF_UNICAST_FLT;

	netdev->priv_flags |= IFF_SUPP_NOFCS;