From: David S. Miller Date: Fri, 6 Jun 2014 19:55:37 +0000 (-0700) 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=77b94799da7aff2897518029928fa1d3acca0a61;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 2014-06-06 This series contains updates to i40e and i40evf. Shannon sets the lan_veb index when the Virtual Ethernet Bridge (VEB) is created for the basic LAN device and its Virtual Switch Interfaces (VSIs). Also adds the VEB/VSI statistics in the ethtool stats output. Increases the reset wait time because the original time was too optimistic and resets were failing after EMPR. This won't delay the actual wait, just allows us to poll more times as needed. He fixes the attempted removal of the HMC space and unhook IRQs when a reset recovery fails because the HMC space never got setup and IRQs are already unhooked in the first place, so the removal is not necessary. Jesse adds a log message for pre-production hardware so that the user is notified that there may be issues with the hardware, yet does not prevent the user from using the hardware. Add the printing of link messages in the i40e driver like all the other Intel Ethernet drivers. Mitch makes log message changes to i40evf to prevent confusion by making the most common messages less scary by lowering them to a less terrifying log level. This is due to the fact that depending on the timing of what the PF driver is doing, it may take a few tries before the VF driver is able to communicate with the PF driver on init or reset recovery. Kamil provides a change to prevent the driver from getting into a endless loop while trying to send GetVersion AQ command, since BO silicon blocks AQ registers when in Blank Flash mode. So introduce a simple check for a correct value in one of the AQ registers to be sure that AQ was configured correctly. Matt adds a function which indicates our intention to enable or disable a particular transmit queue. Also adds a function to notify the device's transmit unit that we are about to enable or disable a transmit queue. ==================== Signed-off-by: David S. Miller --- 77b94799da7aff2897518029928fa1d3acca0a61