ixgbe: Fix VLAN features error
authorAlexander Duyck <aduyck@mirantis.com>
Wed, 11 May 2016 20:23:34 +0000 (13:23 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 16 May 2016 23:56:38 +0000 (16:56 -0700)
commit5eee87cd51df8492d7e61c2d8b5154a15a4888b2
tree83b081ecfa8a5d6e6cbfefed1ab0e488e3d62b79
parent11f2b494bc07f3d054687159ad6b1f3ec12a9040
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: b83e30104bd9 ("ixgbe/ixgbevf: Add support for GSO partial")
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c