Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue

Browse source

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2020-06-18

This series contains fixes to ixgbe, i40e and ice driver.

Ciara fixes up the ixgbe, i40e and ice drivers to protect access when
allocating and freeing the rings.  In addition, made use of READ_ONCE
when reading the rings prior to accessing the statistics pointer.

Björn fixes a crash where the receive descriptor ring allocation was
moved to a different function, which broke the ethtool set_ringparam()
hook.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2020-06-19 12:55:12 -07:00

parent 0ad6f6e767 3995ecbabc

commit 7b075ad9f4

6 changed files with 44 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

View file

29

drivers/net/ethernet/intel/i40e/i40e_main.c

View file

8

drivers/net/ethernet/intel/ice/ice_lib.c

View file

2

drivers/net/ethernet/intel/ice/ice_main.c

View file

12

drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c

View file

14

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

View file