From: David S. Miller Date: Wed, 11 Dec 2013 02:30:16 +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=f00ac4ba035a5a9e73df39ad2f46e203b179367b;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 This series contains updates to i40e, igb, ixgbe and ixgbevf. Shannon provides a couple of i40e patches, first restricts the ethtool diag test messages by using netif_info() macro to when the hardware bit is enabled in the message level netdev message mask. Second provides a fix for when there is an out-of-range descriptor request. Kamil provides a fix for i40e by updating the loopback enum types and add information about the current loopback mode to data returned from get_link_info(). Jesse provides a fix for i40e define name that was being mis-used. I40E_ITR_NONE was being used as an ITRN register index by accident because it was easily associated with the i40e Rx ITR and friends defines, when it should be associated with the DYN_CTL register sets. Jacob provides an update for ixgbevf Kconfig description since the VF driver supports more than just the 82599 device. Don and Alex provide a cleanup patch for ixgbe to make it where head, tail, next to clean and next to use are all reset in a single function for both Tx and Rx path. Before, the code for this was spread out over several areas which made it difficult to track what the values were for each of the values. Carolyn provides two igb patches to add a media switching feature for i354 PHY's and new Media Auto Sense for 82580 devices only. Aaron Sierra provides a fix for igb to resolve an issue with the 64-bit PCI addresses being truncated because the return values of pci_resource_start() and pci_resouce_end() were being cast to unsigned long. Guenter Roeck provides two igb patches, first simplifies the code by attaching the hwmon sysfs attributes to hwmon device instead of the PCI device. Second fixes the temperature sensor attribute index by setting it to 1 instead of 0 (per hwmon ABI). ==================== Signed-off-by: David S. Miller --- f00ac4ba035a5a9e73df39ad2f46e203b179367b