diff options
author | David S. Miller <davem@davemloft.net> | 2013-04-25 00:55:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-25 00:55:27 -0400 |
commit | 92dea7c06656f709a3957aacef20574ce3dbe6fc (patch) | |
tree | 2664042bc9f9bdaad0df284ba8dbc354631cef26 /net | |
parent | d3734b0496f5a310a85bb53310c047b8e42bc440 (diff) | |
parent | 67b1b9033607fa237fb69519ddb4cb4979a651fc (diff) | |
download | lwn-92dea7c06656f709a3957aacef20574ce3dbe6fc.tar.gz lwn-92dea7c06656f709a3957aacef20574ce3dbe6fc.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ixgbe, igb and pci.
The ixgbe changes contains a fix to a possible divide by zero by bailing
out of the ixgbe_update_itr() function if the last interrupt timeslice is
zero. In addition, support is added for the new OCP x520 adapter as well
as LX support for 82599 devices. Jacob provides a patch to change
variable wol_supported to wol_enabled to better reflect what the code
is actually doing (i.e. checking if WoL is enabled).
Alex adds SRIOV helper function to pci that will determine if a PF
has any VFs that are currently assigned to a guest.
The remaining 8 patches are against igb and contain the following changes:
* implement SERDES loopback configuration for i210 devices by unsetting
sigdetect bit, so as to fix Ethtool loopback test failure
* add support for the SMBI semaphore for I210/I211 devices
* implement the new generic pci_vfs_assigned helper function (Alex's PCI
helper function)
* display warning when link speed is downgraded due to Smartspeed
* ensure that VLAN hardware filtering remains enabled when the device is
in promiscuous mode and VT mode simultaneously
* cleanup dead code in igb
* bump the driver version
v2: updated the PCI patch to add SRIOV helper function to remove extern
from the declaration of pci_vfs_assigned in pci.h and return 0 if
SR-IOV is disabled which is inline with other PCI SR-IOV functions
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions