diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-03 11:25:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-03 11:25:45 -0500 |
| commit | ba77919808c6dbfc51b9ed52458c31c06197414f (patch) | |
| tree | d4581e702d0811ab2f56731c99614c8af805581b /net/sctp | |
| parent | c095508770aebf1b9218e77026e48345d719b17c (diff) | |
| parent | 4110e02eb45ea447ec6f5459c9934de0a273fb91 (diff) | |
| download | linux-ba77919808c6dbfc51b9ed52458c31c06197414f.tar.bz2 | |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2018-01-02
This series contains fixes for e1000 and e1000e.
Tushar Dave adds a check to the driver so that it won't attempt to disable a
device that is already disabled for e1000.
Benjamin Poirier provides a fix to e1000e, where a previous commit that
Benjamin submitted changed the meaning of the return value for
"check_for_link" for copper media and not all the instances were properly
updated. Benjamin fixes the remaining instances that needed the change.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions