]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 22 Jun 2017 06:24:40 +0000 (23:24 -0700)
commitf1b08a5f837d36c02c15479010f8dd3e978ceacc
tree9a4a1a354f7e1ff4c2dcbb5bab8d6585fd56e8bb
parentf8d96f9e129ab5e21f3f4738bf40c6c308e1c57e
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>
Orabug: 26243014
(cherry picked from commit 838086414b3cda5c592591f2b82256996306dab6)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Ethan Zhao <ethan.zhao@oracle.com>
drivers/net/ethernet/intel/e1000e/netdev.c