e1000e: keep Rx/Tx HW_VLAN_CTAG in sync
authorJarod Wilson <jarod@redhat.com>
Thu, 9 Jun 2016 23:50:13 +0000 (19:50 -0400)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 29 Jun 2016 16:10:17 +0000 (09:10 -0700)
commit838086414b3cda5c592591f2b82256996306dab6
treecaa38857a90e30cc86c55abeaa6d2d4630ffb823
parent751ad819b0bf443ad8963eb7bfbd533e6a463973
e1000e: keep Rx/Tx HW_VLAN_CTAG in sync

The bit in the e1000 driver that mentions explicitly that the hardware
has no support for separate RX/TX VLAN accel toggling rings true for
e1000e as well, and thus both NETIF_F_HW_VLAN_CTAG_RX and
NETIF_F_HW_VLAN_CTAG_TX need to be kept in sync.

Revert a portion of commit 889ad456660461 ("e1000e: keep VLAN interfaces
functional after rxvlan off") since keeping the bits in sync resolves
the original issue.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000e/netdev.c