diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-30 08:57:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-30 08:57:24 -0400 |
| commit | 5ab0d6a016b19d8cbd503eafd0ef701cfd854402 (patch) | |
| tree | efe0a8376860b74e33f38d5b0815213bcbfadd9e /include/net/ip.h | |
| parent | e7bdea7750eb2a64aea4a08fa5c0a31719c8155d (diff) | |
| parent | b3a3c5176c146ec7de653a3062237620464175fb (diff) | |
| download | lwn-5ab0d6a016b19d8cbd503eafd0ef701cfd854402.tar.gz lwn-5ab0d6a016b19d8cbd503eafd0ef701cfd854402.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2016-06-29
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip.h')
0 files changed, 0 insertions, 0 deletions