From: David S. Miller Date: Wed, 18 Dec 2013 19:58:41 +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=ac727c49d772c059d6c544680d08c1832b93b67a;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, ixgbevf, ixgbe and igb. Don provides an ixgbevf patch to add DCB configuration into the queue setup so that we won't have to allocate queues in a separate place when enabling DCB. Guenter Roeck provides 2 patches for ixgbe to simplify the code by attaching hwmon sysfs attributes to hwmon device instead of PCI device. Also fix an issues where the temperature sensor attribute index was being started with the value 0 and not 1 as per the hwmon API. Carolyn provides igb patches to fix queue allocation method to accommodate changes during runtime. This includes changing how the driver initializes MSIx and checks for MSIx configuration to make it easier to reconfigure the device when queue changes happen at runtime. Neerav and Shannon fixes i40e debugfs commands that dump hex information by using print_hex_dump(). Shannon provides several i40e fixes which include the prevention of null pointer exception in the dump descriptor by checking that rings were allocated before trying to reference them. Fixed up a couple of scanfs to accept various base numbers instead of silently requiring hex. Anjali fixes up i40e where the incorrect defines were being used for misc interrupts. Alan Cox provides a fix for i40e where we assume that the resulting buffer is zero terminated when we then re-use it. The sscanf is limited to 512 bytes but needs to be 511 to allow for a terminator. Stephen Hemminger fixes i40e by making local functions static and removes unused code (i40e_aq_add/remove_vlan() functions). ==================== Signed-off-by: David S. Miller --- ac727c49d772c059d6c544680d08c1832b93b67a