Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2015-02-09
This series contains updates to i40e and i40evf only.
Rickard Strandqvist removes an unused function for i40e.
John Linville reorders a piece of code so that y_budget does not get used
by the FCoE code before it gets initialized.
Mitch adds a delay after VF reset with a minimum of 10ms to allow the
hardware internal FIFOs to flush. Bumps up the ARQ descriptors, since
we can easily overrun the PF's admin receive queue. Added locking around
the VF reset code, since during VF deallocation, we cannot depend on
simply masking the interrupt since this does not lock out the service task,
which can still call the reset routine. Fix a potential multi-minute
delay on driver unload, VF disable or system shutdown. When the module
is being unloaded, waiting for the PF to politely handle all of our admin
queue requests might take forever with a lot of VFs enabled, so just
stop everything and request a VF reset. Also stops the watchdog during
shutdown to prevent a log full of admin queue errors and the occasional
hang when the system is shut down.
Anjali forces Tx descriptor writebacks on ITR by kicking off the SWINT
interrupt since we noticed that there are non-cache-aligned Tx
descriptors waiting in the ring while interrupts are disabled under NAPI.
Enables loopback for the FCoE VSI, so that VSIs can directly talk to each
other without going out on the wire.
Matthew fixes an LED blink issue by making sure to clear the GPIO blink
field, instead of OR'ing against zero if the field is already '1'.
Greg cleans up a function header comment.
Vasu helps biosdevname user tool to differentiate dev_port for PCoE netdev
and PF netdev, by setting different dev_port value for FCoE netdev.
Carolyn adds a call to u64_stats_init to the receive setup in order to
avoid lockdep errors with seqcount on newer kernels.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
