From: David S. Miller Date: Tue, 13 Jan 2015 21:06:07 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=721f7951223ae9b049e9840c4d2f56f0abf83075;p=linux-beck.git 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-13 This series contains updates to i40e and i40evf. Mitch provides a fix for i40e to move the call to pci_disable_sriov() so that it is called earlier to ensure that the PF driver won't free VF resources before the VF remove routine can complete. Also cleans up redundant and duplicate code in the i40evf. Refactors the i40evf shutdown code and let the watchdog take care of shutting things down. Fix a possible memory leak, if we are using VLANs and the communication with the PF fail during shutdown. On some versions of the firmware, the VF admin send queue may become stalled. In this case, the easiest solution is to place another descriptor on the queue and the firmware will then process both requests. Greg adds a warning when the NPAR enabled partitions detected a link speed less than 10 Gpbs. Vasu removes redundant VN2VN MAC address which were already added by the FCoE stack. Shannon adds code to find how many partitions there are per port and what is the current partition_id when in NPAR mode. In multifunction mode, make sure we only allow SR/IOV on the master PF of a port and only allow partition 1 to set WoL, speed and flow control. Kamil adds code to read the PBA block from shadow RAM and returns the part number in a string format. Catherine provides a fix to check if link state and link speed has changed before exiting link event v2: remove un-needed {} in patch #3 of the series based on feedback from Sergei Shtylyov ==================== Signed-off-by: David S. Miller --- 721f7951223ae9b049e9840c4d2f56f0abf83075