diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-22 12:23:18 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-22 12:23:18 -0700 |
commit | fd183f6a73fc0ff3e32c636dbb539e35d4c530c9 (patch) | |
tree | 64c63653710ddbc15e81d81c53d47a3928953b51 /net | |
parent | 5dc7c77967a64a1c2cb1a45f45f580fa18927a4c (diff) | |
parent | 76886596921dd0e058f7f0a16de6151629390d15 (diff) |
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 and ixgbevf.
...
Akeem G. Abodunrin (1):
igb: reset PHY in the link_up process to recover PHY setting after
power down.
Alexander Duyck (8):
ixgbe: Drop probe_vf and merge functionality into ixgbe_enable_sriov
ixgbe: Change how we check for pre-existing and assigned VFs
ixgbevf: Add lock around mailbox ops to prevent simultaneous access
ixgbevf: Add support for PCI error handling
ixgbe: Fix handling of FDIR_HASH flag
ixgbe: Reduce Rx header size to what is actually used
ixgbe: Use num_tcs.pg_tcs as upper limit for TC when checking based
on UP
ixgbe: Use 1TC DCB instead of disabling DCB for MSI and legacy
interrupts
Don Skidmore (1):
ixgbe: add support for new 82599 device
Greg Rose (1):
ixgbevf: Fix namespace issue with ixgbe_write_eitr
John Fastabend (2):
ixgbe: fix RAR entry counting for generic and fdb_add()
ixgbe: remove extra unused queues in DCB + FCoE case
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions