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-01-16
This series contains updates to i40e and i40evf.
This series is a little bit larger than normal because two of the patches are
version bumps.
Shannon provides tweaks to i40e and i40evf to keep the firmware, software
and silicon validation in line together by removing unused and
deprecated code, adding define for iSCSI and fix queue mask size. Fix
i40e so we do not give up in the reset/rebuild process if DCB setup
fails, just handle it the same as in the probe setup. Cleans up PTP
log messages by removing the use of __func__ as we are not using that
any longer and removes the netdev name, since that can change and can
be misleading. Adds struct size checks to indirect and command
structs that were left out previously. Added admin queue API updates
(LLDP control, OEM OCSD and OCBB commands).
Kevin increases ASQ timeout for scenarios with multi-function devices.
Carolyn fixes a problem where the interrupts descriptions from the MSIx
configuration were truncating the needed bus info, which makes it hard
to distinguish configurations from port to port. Increased the string
buffer size in order to allow the full data to be displayed.
Sravanthi cleans up the dump stats string from debugfs.
Jacob updates i40e to only enable the PTP interrupt in PFs which have PTP
enabled, instead of blindly enabling the PTP interrupt flags for all PFs.
Also updated i40e so that we do not do Tx or Rx timestamps if we do not
have PTP enabled. Added the same check against pf->ptp_rx as we have
in Rx timestamp code path because it is possible that the user can
configure only Tx hardware timestamping so we do not want to check for
Rx timestamp hang since the software won't be handling them.
Neerav updates the driver to disable firmware LLDP agent for NICs with
a firmware version lower than v4.3 and added a message when this happens.
Adds parsing and reporting of iSCSI capability for a given device or
function, as well as adding support for iSCSI partition type with DCB
in NPAR mode.
v2:
- Dropped patch 10 "i40e: clean up PTP log messages" based on feedback
from David Laight and David Miller
- Split up the original patch 13 "i40e: AQ API updates for new commands"
into 2 patches (now #12 & #13) based on feedback from Or Gerlitz
====================
Signed-off-by: David S. Miller <davem@davemloft.net>