diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-28 18:42:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-28 18:42:13 +0100 |
| commit | 07cb1c175e45b649daff5ec46012934904b8b07e (patch) | |
| tree | 608c6f7ace4c09acf1ffad3ebe647ca50bfe9689 /net | |
| parent | ipv6: addrconf: silence sparse endianness warnings (diff) | |
| parent | ixgbevf: add check for CHECKSUM_PARTIAL when doing TSO (diff) | |
| download | linux-07cb1c175e45b649daff5ec46012934904b8b07e.tar.xz linux-07cb1c175e45b649daff5ec46012934904b8b07e.zip | |
Merge branch 'intel-next'
Aaron Brown says:
====================
This series contains updates to ixgbe and ixgbevf.
Don provides an update to change a hard coded timeout interval to
a system-wide timeout one, collects AUTOC register functions into
one place and fixes some firmware bit handling.
Emil resolves a tx handling error introduced in a recent commit and
adds check for CHECKSUM_PARTIAL to avoid an skb_is_gso check
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions