Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2014-06-24
This series contains updates to i40e and i40evf.
Greg provides a patch to stop the VF device after setting its MAC address.
This is due to if the host VMM administrator has changed the VF device's MAC
address then the i40e driver needs to halt the VF device so that the
administrator will be forced to reload the VF driver so that the VF driver
will start using the newly assigned MAC address.
Shannon provides several patches for i40e, first makes prep_for_test() a
void function since the return value was being ignored for the most part
by all its callers. Adds a log warning when the firmware's API minor/major
number is not what we expect to assist the user by informing them they
may need to update their NVM or SW. Cleans up a stray print message
so that it is similar to other print messages. Ensures to set the
WoL flag when setting LAA and allow the user to set LAA again. So do
not short-circuit the LAA assignment when the driver thinks it has
already been done as it is possible that the user might want to force
the address setting again. Provides a couple more LAA fixes to ensure
the LAA gets restored after resets.
Neerav provides a patch for i40e to add a PF reset when a malicious driver
event for the PF occurs. As per the specification when the PF driver
receives a malicious driver event the queue that caused the event is
already stopped and it is expected that the function that owns the queue
will reset the queue, but in some cases it may not be possible to determine
the queue, so it is suggested to reset the whole function.
Carolyn fixes ethtool coalesce settings to allow 0 as a disable value and
adds message to user about invalid values.
Jesse removes a reserved type which was not removed from the code.
Catherine provides a patch to add the ability to enable/disable link from
set_link)restart_an() which will make it easy to toggle link without
calling set_phy_config() when no other link settings need to change.
Anjali provides a patch to ensure we do a PF reset on Tx hang and that
way we avoid any Malicious Driver Detect (MDD) events because of a Tx
queue disable failure.
v2:
- fixed the un-needed return in patch 2 based on feedback from Sergei Shtylyov
- added punctuation to print statements and code comment based on
feedback from Sergei Shtylyov
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
