From: David S. Miller Date: Fri, 27 Jun 2014 19:59:38 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c1c27fb9b3040a2559d4d3e1183afa8c106bc94a;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2014-06-26 This series contains updates to i40e and i40evf. Kamil provides a cleanup patch to i40e where we do not need to acquire the NVM for shadow RAM checksum calculation, since we only read the shadow RAM through SRCTL register. Paul provides a fix for handling HMC for big endian architectures for i40e and i40evf. Mitch provides four cleanup and fixes for i40evf. Fix an issue where if the VF driver fails to complete early init, then rmmod can cause a softlock when the driver tries to stop a watchdog timer that never got initialized. So add a check to see if the timer is actually initialized before stopping it. Make the function i40evf_send_api_ver() return more useful information, instead of just returning -EIO by propagating firmware errors back to the caller and log a message if the PF sends an invalid reply. Fix up a log message that was missing a word, which makes the log message more readable. Fix an initialization failure if many VFs are instantiated at the same time and the VF module is autoloaded by simply resending firmware request if there is no response the first time. Jacob does a rename of the function i40e_ptp_enable() to i40e_ptp_feature_enable(), like he did for ixgbe, to reduce possible confusion and ambugity in the purpose of the function. Does follow on PTP work on i40e, like he did for ixgbe, by breaking the PTP hardware control from the ioctl command for timestamping mode. By doing this, we can maintain state about the 1588 timestamping mode and properly re-enable to the last known mode during a re-initialization of 1588 bits. Anjali cleans up the i40e driver where TCP-IPv4 filters were being added twice, which seems to be left over from when we had to add two PTYPEs for one filter. Fixes the flow director sideband logic to detect when there is a full flow director table. Also fixes the programming of FDIR where a couple of fields in the descriptor setup that were not being programmed, which left the opportunity for stale data to be pushed as part of the descriptor next time it was used. ==================== Signed-off-by: David S. Miller --- c1c27fb9b3040a2559d4d3e1183afa8c106bc94a