From: David S. Miller Date: Fri, 27 Oct 2017 15:05:34 +0000 (+0900) Subject: Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Tag: MMI-PSA29.97-13-9~4457^2~8 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8ab190fbe96178449d8195c3582aa10ce684c386;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch '40GbE' of git://git./linux/kernel/git/jkirsher/net-queue Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2017-10-26 This series contains fixes to e1000, igb, ixgbe and i40e. Vincenzo Maffione fixes a potential race condition which would result in the interface being up but transmits are disabled in the hardware. Colin Ian King fixes a possible NULL pointer dereference in e1000, which was found by Coverity. Jean-Philippe Brucker fixes a possible kernel panic when a driver cannot map a transmit buffer, which is caused by an erroneous test. Alex provides a fix for ixgbe, which is a partial revert of the commit ffed21bcee7a ("ixgbe: Don't bother clearing buffer memory for descriptor rings") because the previous commit messed up the exception handling path by adding the count back in when we did not need to. Also fixed a typo, where the transmit ITR setting was being used to determine if we were using adaptive receive interrupt moderation or not. Lastly, fixed a memory leak by including programming descriptors in the cleaned count. ==================== Signed-off-by: David S. Miller --- 8ab190fbe96178449d8195c3582aa10ce684c386