diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-21 12:58:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-21 12:58:38 -0400 |
| commit | 647401d5acaf3614957bcd12f702deb95d605ebe (patch) | |
| tree | d1a1bbb5d2c742a3b8211212578ec87e189fdd70 /net | |
| parent | 6d4596905b65bf4c63c1a008f50bf385fa49f19b (diff) | |
| parent | c5ffe7e1f745984b37b8ffe03b03f3d716a072f3 (diff) | |
| download | linux-647401d5acaf3614957bcd12f702deb95d605ebe.tar.gz linux-647401d5acaf3614957bcd12f702deb95d605ebe.tar.bz2 linux-647401d5acaf3614957bcd12f702deb95d605ebe.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates
This series contains updates to e1000e, igb, ixgbe and i40e.
Most notably are Jakub's patches to clean up the Rx time stamping
code for ixgbe and the fix up of debug messages with proper termination.
Jesse's i40e patch fixes an issue reported by Eric Dumazet that the
i40e driver was allowing the hardware to replicate the PSH flag on
all segments of a TSO operation. With this fix, we are now configuring
the CWR bit to only be set in the first packet of a TSO and we
enable TSO_ECN in order to advertise to the stack that we do the right
thing on the wire.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions