]> git.baikalelectronics.ru Git - kernel.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)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 16 Oct 2015 11:55:29 +0000 (04:55 -0700)
commit8ebe28051b5a487756dd57d7a42c74408723e9b2
treed3904def698c2d33d8a506b6e1603928596e7f8d
parent3161d6e1b3388271df37cd0db83e786ff90d5b17
i40evf: correctly populate vlan_features

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>
drivers/net/ethernet/intel/i40evf/i40evf_main.c