diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-03 20:19:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-03 20:19:16 -0700 |
| commit | 633cc5fe768c0223f80637527eb9be916bcaa9ee (patch) | |
| tree | eb16956ea35f61d79601f8dd1073b7927ad2e979 /net/llc | |
| parent | 3896d655f4d491c67d669a15f275a39f713410f8 (diff) | |
| parent | 529498cde04537211cc3aa8f920c371b91c0f7d8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2015-06-03
This series contains updates to e1000e only.
Yanir provides 8 fixes and 1 version bump for e1000e. First fix resolves
a possible unit hang if multiple descriptors are available in the rings
during reset or runtime suspend. Fixed a warning on SPARC compile based
on a suggested solution from Alex Duyck. Fixed a logical error, where
a "if" condition under which a flush should occur, was revered. Fixed
a hardware issue that prevented i219 from working in legacy interrupts
mode. Fixed the hardware clock configuration and suprious non-linear
increment. Lastly, fixed a system hang which occurred during execution
of "ethtool -t <NIC>", by disabling MULR for the loopback test to avoid
the hand state.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc')
0 files changed, 0 insertions, 0 deletions