]> www.infradead.org Git - users/jedix/linux-maple.git/commit
i40evf: correctly populate vlan_features
authorMitch Williams <mitch.a.williams@intel.com>
Mon, 28 Sep 2015 18:12:40 +0000 (14:12 -0400)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Mar 2016 16:32:53 +0000 (08:32 -0800)
commitdf7f55ace71189b7a2762797b60a5f320e0f5128
tree201f13fad83f2708d254070bd391e555b6f100b9
parentddd9e47e9f53ff52bb7419f69dcd48c8e1ac87d3
i40evf: correctly populate vlan_features

Orabug: 22342532

The vlan_features field was correctly being set to the same value as the
netdev features field. However, this was being done before the features
were actually being set up, leaving the vlan_features empty.

Also, after a reset, vlan_features will be incorrectly assigned the
previous netdev feature flags, which can contain VLAN feature bits. This
makes the VLAN code angry and will cause a stack dump.

To fix these issues, set up the netdev features first, then mask out the
VLAN feature bits when assigning vlan_features.

Change-ID: Ib0548869dc83cf6a841cb8697dd94c12359ba4d2
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit cc7e406cb967ccc84cd2141398bba24b07d68788)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/i40evf/i40evf_main.c