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

Browse source

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2020-09-25

This series contains updates to the iavf and ice driver.

Sylwester fixes a crash with iavf resume due to getting the wrong pointers.

Ani fixes a call trace in ice resume by calling pci_save_state().

Jakes fixes memory leaks in case of register_netdev() failure or
ice_cfg_vsi_lan() failure for the ice driver.

v2: Rebased; no other changes
====================

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

...

This commit is contained in:

David S. Miller 2020-09-25 16:24:20 -07:00

parent 4e1b469ab0 f6a07271bb

commit abe2f12d94

4 changed files with 22 additions and 22 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

4

drivers/net/ethernet/intel/iavf/iavf_main.c

View file

20

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

View file

6

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

View file

14

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

View file