diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-04-05 19:31:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-05 19:31:19 -0400 |
| commit | aa4f069e167b8302b0ccf920bca389a1fbe2bc4a (patch) | |
| tree | 475354a2f91547a5e077c4eba46aa22e6efd4130 /net | |
| parent | sctp: use list_* in sctp_list_dequeue (diff) | |
| parent | e1000: Double Tx descriptors needed check for 82544 (diff) | |
| download | linux-dev-aa4f069e167b8302b0ccf920bca389a1fbe2bc4a.tar.xz linux-dev-aa4f069e167b8302b0ccf920bca389a1fbe2bc4a.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-04-05
This series contains updates to i40e and e1000.
Jesse fixes an issue where code was added by a previous commit but the
flag to enable it was never set.
Alex fixes the e1000 driver from grossly overestimated the descriptors
needed to transmit a frame.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions