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>
No related branches found
No related tags found
Showing
- drivers/net/ethernet/intel/igb/e1000_82575.c 3 additions, 6 deletionsdrivers/net/ethernet/intel/igb/e1000_82575.c
- drivers/net/ethernet/intel/igb/e1000_hw.h 1 addition, 2 deletionsdrivers/net/ethernet/intel/igb/e1000_hw.h
- drivers/net/ethernet/intel/igb/e1000_i210.c 39 additions, 26 deletionsdrivers/net/ethernet/intel/igb/e1000_i210.c
- drivers/net/ethernet/intel/igb/igb_ethtool.c 2 additions, 7 deletionsdrivers/net/ethernet/intel/igb/igb_ethtool.c
- drivers/net/ethernet/intel/igb/igb_main.c 78 additions, 39 deletionsdrivers/net/ethernet/intel/igb/igb_main.c
- drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c 3 additions, 1 deletiondrivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c 4 additions, 6 deletionsdrivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c 14 additions, 2 deletionsdrivers/net/ethernet/intel/ixgbe/ixgbe_main.c
- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c 17 additions, 4 deletionsdrivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h 5 additions, 1 deletiondrivers/net/ethernet/intel/ixgbe/ixgbe_type.h
- drivers/pci/iov.c 41 additions, 0 deletionsdrivers/pci/iov.c
- include/linux/pci.h 5 additions, 0 deletionsinclude/linux/pci.h
Loading
Please register or sign in to comment