This series contains updates to i40e and i40evf only. Sergey cleans up a duplicate call to i40e_prep_for_reset() during shutdown.
YueHaibing cleans up i40evf by removing code that was never being used or called within the driver. Jake updates the ethtool statistics to use a helper function since many of the statistics use the same basic logic for copying strings into the supplied buffer. Cleaned up the use of a local variable that is no longer needed or used. Fixed additional stats issues, including the failure to update the data pointer which was causing stats to be reported incorrectly. Mariusz fixes a bug where there was an oversight in configuring FEC when link settings were forced which was causing 25G link to be configured incorrectly. Piotr adds a missing return code for when the firmware returns a busy state. Also added the process to command firmware to start rearrangement when switching between old NVM structure to the new flat NVM. The following are changes since commit de7de576eca204de9a38e2f6dafe6b7c1ddc85c1: Merge branch 'ieee802154-for-davem-2018-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next and are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 40GbE Jacob Keller (7): i40e: add helper function for copying strings from stat arrays i40e: add helper to copy statistic values into ethtool buffer i40e: convert VEB TC stats to use an i40e_stats array i40e: convert priority flow control stats to use helpers i40e: remove unnecessary i variable causing -Wshadow warning i40e: fix warning about shadowed ring parameter i40e: fix i40e_add_queue_stats data pointer update Mariusz Stachura (1): i40e: Set fec_config when forcing link state Piotr Azarewicz (2): i40e: Add additional return code to i40e_asq_send_command i40e: Add AQ command for rearrange NVM structure Sergey Nemov (1): i40e: Remove duplicated prepare call in i40e_shutdown YueHaibing (1): i40e/i40evf: remove redundant functions i40evf_aq_{set/get}_phy_register drivers/net/ethernet/intel/i40e/i40e_adminq.c | 2 + .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 + drivers/net/ethernet/intel/i40e/i40e_common.c | 35 ++ .../net/ethernet/intel/i40e/i40e_ethtool.c | 347 ++++++++++++------ drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +- .../net/ethernet/intel/i40e/i40e_prototype.h | 3 + .../net/ethernet/intel/i40evf/i40e_adminq.c | 2 + .../ethernet/intel/i40evf/i40e_adminq_cmd.h | 2 + .../net/ethernet/intel/i40evf/i40e_common.c | 69 ---- 9 files changed, 276 insertions(+), 194 deletions(-) -- 2.17.1