This series contains fixes to e1000e and ixgbevf.
Jarod Wilson's fix for e1000e was a follow-on patch to his previous fix to
keep the hardware VLAN CTAG's for receive and transmit in sync, which
in turn resolves the original issue, so revert a portion of the original
fix.
Xin Long noticed that the ret_val needed to be initialized to IXGBE_ERR_MBX,
instead of -IXGBE_ERR_MBX.
The following are changes since commit 751ad819b0bf443ad8963eb7bfbd533e6a463973:
Merge tag 'mac80211-for-davem-2016-06-29-v2' of
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue master
Jarod Wilson (1):
e1000e: keep Rx/Tx HW_VLAN_CTAG in sync
Xin Long (1):
ixgbevf: ixgbevf_write/read_posted_mbx should use IXGBE_ERR_MBX to
initialize ret_val
drivers/net/ethernet/intel/e1000e/netdev.c | 21 +++++++++------------
drivers/net/ethernet/intel/ixgbevf/mbx.c | 4 ++--
2 files changed, 11 insertions(+), 14 deletions(-)
--
2.5.5
