diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-18 20:20:03 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-18 20:20:03 +0400 |
commit | c3fe065cea56f1fcd4f8e4ae1fb15fa785d2bb79 (patch) | |
tree | ed1157551ab340effe440c73f4ee63b5e6dbee42 /drivers/net/ethernet/emulex | |
parent | 1c652966d9215d7c9fac7394bb7014213bffabb7 (diff) | |
parent | 908421f6cc6b6e5db6e8e8c35ab8fc0fb64f25c2 (diff) | |
download | linux-c3fe065cea56f1fcd4f8e4ae1fb15fa785d2bb79.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jerr Kirsher says:
====================
This series contains updates to ixgbe & ixgbevf.
...
Alexander Duyck (6):
ixgbe: Ping the VFs on link status change to trigger link change
ixgbe: Handle failures in the ixgbe_setup_rx/tx_resources calls
ixgbe: Move configuration of set_real_num_rx/tx_queues into open
ixgbe: Update the logic for ixgbe_cache_ring_dcb and DCB RSS
configuration
ixgbe: Cleanup logic for MRQC and MTQC configuration
ixgbevf: Update descriptor macros to accept pointers and drop _ADV
suffix
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex')
0 files changed, 0 insertions, 0 deletions