From: David S. Miller Date: Sat, 30 Nov 2013 17:42:20 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net X-Git-Tag: v3.13-rc3~28^2~12 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=696701b89d44c636c800a9b98f4a6a8015a6e1c4;p=linux.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to igb, e1000 and ixgbe. Akeem provides a igb fix where WOL was being reported as supported on some ethernet devices which did not have that capability. Yanjun provides a fix for e1000 which is similar to a previous fix for e1000e commit bb9e44d0d0f4 ("e1000e: prevent oops when adapter is being closed and reset simultaneously"), where the same issue was observed on the older e1000 cards. Vladimir Davydov provides 2 e1000 fixes. The first fixes a lockdep warning e1000_down() tries to synchronously cancel e1000 auxiliary works (reset_task, watchdog_task, phy_info_task and fifo_stall_task) which take adapter->mutex in their handlers. The second patch is to fix a possible race condition where reset_task() would be running after adapter down. John provides 2 fixes for ixgbe. First turns ixgbe_fwd_ring_down to static and the second disables NETIF_F_HW_L2FW_DOFFLOAD by default because it allows upper layer net devices to use queues in the hardware to directly submit and receive skbs. Mark Rustad provides a single patch for ixgbe to make ixgbe_identify_qsfp_module_generic static to resolve compile warnings. v2: Drop igb patch "igb: Update queue reinit function to call dev_close when init of queues fails" from Carolyn, so that the solution can be re-worked based on feedback from David Miller. ==================== Signed-off-by: David S. Miller --- 696701b89d44c636c800a9b98f4a6a8015a6e1c4