diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-09-13 19:35:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-13 19:35:24 -0400 |
| commit | c9771bfd6ddae11cea367cd544e2c9d193f1f305 (patch) | |
| tree | 97b08c92411c41c0562e3b12648d1b0847a9d058 /drivers/atm | |
| parent | net/irda/mcs7780: fix memory leaks in mcs_net_open() (diff) | |
| parent | e1000e: fix overrun of PHY RAR array (diff) | |
| download | linux-dev-c9771bfd6ddae11cea367cd544e2c9d193f1f305.tar.xz linux-dev-c9771bfd6ddae11cea367cd544e2c9d193f1f305.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 ixgbe and e1000e.
Jacob provides a ixgbe patch to fix the configure_rx patch to properly
disable RSC hardware logic when a user disables it. Previously we only
disabled RSC in the queue settings, but this does not fully disable
hardware RSC logic which can lead to unexpected performance issues.
Emil provides three fixes for ixgbe. First fixes the ethtool loopback
test when DCB is enabled, where the frames may be modified on Tx
(by adding VLAN tag) which will fail the check on receive. Then a fix
for QSFP+ modules, limit the speed setting to advertise only one speed
at a time since the QSFP+ modules do not support auto negotiation.
Lastly, resolve an issue where the driver will display incorrect info
for QSFP+ modules that were inserted after the driver has been loaded.
David Ertman provides to fixes for e1000e, one removes a comparison to
the boolean value true where evaluating the lvalue will produce the
same result. The other fixes an error in the calculation of the
rar_entry_count, which causes a write of unkown/undefined register
space in the MAC to unknown/undefined register space in the PHY.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
0 files changed, 0 insertions, 0 deletions