From: David S. Miller Date: Thu, 9 Jan 2014 20:13:12 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=bfec4c3b71c25d307d8e4005518fb5dbff43192d Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to i40e only. Anjali provides a fix where interrupts were not being re-enabled on ICR0 even though they were auto masked by hardware. Then provides a fix to cleanup RSS initialization because it was doing some extra work, so remove the extra work and any bugs it created when managing number of queues. Since hardware requires a full packet template to be pointed to when adding hardware flow filters, add the template and use it for programming filters. Jesse provides a fix to replace the use of driver specific defines with kernel ETH_ALEN defines. Then disables packet split because with the use of GRO, we do not need the extra bus overhead. Fixes spelling error in code comment. Kamil provides a fix for the driver where the hardware expects the MAC address in a very specific format and the driver was filing the data incorrectly. Mitch provides a fix to resolve a panic on reset by adding checks to VSI->rx_rings. Then shortens alloc_rx_buff_failed and alloc_rx_page_failed variables since both part of an RX specific structure so just remove the _rx part of the name. Then fixes badly formatted lines, long lines and mis-formatted lines. Shannon provides a fix to call AQ to release any reservation held by this PF on the NVM resource lock on startup, in order to clear anything that might have been left over from a previous run. Then removes interrupt on AQ error since nearly everything we do is synchronous, using the interrupt-on-error bit is unnecessary and causing unneeded interrupts. Adds code to handle the ability to send messages among the physical function interfaces by the admin queue. Catherine sets the MFP flag earlier in software init and uses that flag to decide if other hardware work-arounds are required which turns off flow director in MFP mode. ==================== Signed-off-by: David S. Miller --- bfec4c3b71c25d307d8e4005518fb5dbff43192d