aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-01-18 14:30:27 +0100
committerDavid S. Miller <davem@davemloft.net>2020-01-18 14:30:27 +0100
commit9aaa29494030a8ba89311b70123a367a26788323 (patch)
tree0db25258cf7531c2f193ebf8a70920adc3f4c9d0 /include/net
parentnetns: Constify exported functions (diff)
parentice: remove redundant assignment to variable xmit_done (diff)
downloadlinux-dev-9aaa29494030a8ba89311b70123a367a26788323.tar.xz
linux-dev-9aaa29494030a8ba89311b70123a367a26788323.zip
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2020-01-17 This series contains updates to igc, i40e, fm10k and ice drivers. Sasha fixes a typo in a code comment that referred to silicon that is not supported in the igc driver. Cleaned up a defined that was not being used. Added support for another i225 SKU which does not have an NVM. Added support for TCP segmentation offload (TSO) into igc. Added support for PHY power management control to provide a reliable and accurate indication of PHY reset completion. Jake adds support for the new txqueue parameter to the transmit timeout function in fm10k which reduces the code complexity when determining which transmit queue is stuck. Julio Faracco makes the similar changes that Jake did for fm10k, for i40e and ice drivers. Added support for the new txqueue parameter in the transmit timeout functions for i40e and ice. Colin Ian King cleans up a redundant initialization of a local variable. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions