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

Browse source

Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2021-06-17

This series contains updates to ice driver only.

Jake corrects a couple of entries in the PTYPE table to properly
reflect the datasheet and removes unneeded NULL checks for some
PTP calls.

Paul reduces the scope of variables and removes the use of a local
variable.

Shaokun Zhang removes a duplicate function declaration.

Lorenzo Bianconi fixes a compilation warning if PTP_1588_CLOCK is
disabled.

Colin Ian King changes a for loop to remove an unneeded 'continue'.
====================

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

...

This commit is contained in:

David S. Miller 2021-06-17 12:11:28 -07:00

parent 200cedf192 587b839de7

commit 8fe088bd4f

7 changed files with 18 additions and 26 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/ice/ice_lan_tx_rx.h

View file

8

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

View file

7

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

View file

12

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

View file

2

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

View file

10

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

View file

1

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

View file