diff options
author | David S. Miller <davem@davemloft.net> | 2015-09-23 21:52:02 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-23 21:52:02 (GMT) |
commit | 6015a6c137e5bb5c0484ebe546540f88d690cfd5 (patch) | |
tree | 7e725b8549b5975678c3eaf356a931f3bbcc2ecf /drivers/net/vmxnet3 | |
parent | 16cfbae160c46eadf0105892b676c365b051bfc2 (diff) | |
parent | 25b1029789f98f945a03a2d04662a94b357aacb9 (diff) | |
download | linux-6015a6c137e5bb5c0484ebe546540f88d690cfd5.tar.xz |
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-09-22
This series contains updates to e1000, e1000e, igbvf, ixgbe, ixgbevf and
fm10k.
Jacob provides several updates for fm10k, which cleans up comments and
most notably a fix for a corner case issue with the PF/VF mailbox code.
The issue being fm10k_mbx_reset_work clears various states about the
mailbox, but does not clear the Tx FIFO head/tail pointers. We also
are not able to simply clear these pointers, as we would drop
untransmitted messages without error. Also adds support for extra debug
statistics, which provides the ability to see what the PF thinks the
VF mailboxes look like.
Don adds support for SFP+ in X550 and support for SCTP flow director
filters SCTP mask.
Francois Romieu dusts off the e1000 driver and removes some dead calls
to e1000_init_eeprom_params().
Toshiaki Makita provides three patches to enable TSO for stacked VLAN's
on e1000e, igbvf and ixgbevf.
Mark provides the first of several ixgbe updates. First updates the
driver to accept SFP not present error for all devices, since an SFP
can still be inserted. Adds support for SFP insertion interrupt on
X550EM devices with SPFs. Adds I2C combined operations on X550EM
(not X550) devices. Moved the setting of lan_id to before any I2C
eeprom access. Lastly, set the bit bang mode in the hardware when
performing bit banding I2C operations on X550.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3')
0 files changed, 0 insertions, 0 deletions