OpenCloudOS-Kernel/drivers/net/ethernet/sfc
David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Two minor conflicts:

1) net/ipv4/route.c, adding a new local variable while
   moving another local variable and removing it's
   initial assignment.

2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes.
   One pretty prints the port mode differently, whilst another
   changes the driver to try and obtain the port mode from
   the port node rather than the switch node.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-09-22 16:45:34 -07:00
..
falcon treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
Kconfig sfc: skeleton EF100 PF driver 2020-07-27 12:26:55 -07:00
Makefile sfc: skeleton EF100 PF driver 2020-07-27 12:26:55 -07:00
bitfield.h sfc: extend bitfield macros up to POPULATE_DWORD_13 2020-06-29 17:37:48 -07:00
ef10.c sfc: advertise encapsulated offloads on EF10 2020-09-11 17:15:22 -07:00
ef10_regs.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
ef10_sriov.c sfc: move vport_id to struct efx_nic 2020-05-11 13:31:49 -07:00
ef10_sriov.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
ef100.c sfc: Fix error code in probe 2020-09-21 13:55:13 -07:00
ef100.h sfc: skeleton EF100 PF driver 2020-07-27 12:26:55 -07:00
ef100_ethtool.c sfc: add ethtool ops and miscellaneous ndos to EF100 2020-09-07 14:46:13 -07:00
ef100_ethtool.h sfc: skeleton EF100 PF driver 2020-07-27 12:26:55 -07:00
ef100_netdev.c sfc: add ethtool ops and miscellaneous ndos to EF100 2020-09-07 14:46:13 -07:00
ef100_netdev.h sfc: skeleton EF100 PF driver 2020-07-27 12:26:55 -07:00
ef100_nic.c sfc: remove duplicate call to efx_init_channels from EF100 probe 2020-09-11 14:55:14 -07:00
ef100_nic.h sfc_ef100: add nic-type for VFs, and bind to them 2020-08-03 18:22:55 -07:00
ef100_regs.h sfc_ef100: add EF100 register definitions 2020-07-27 12:26:55 -07:00
ef100_rx.c sfc: fix boolreturn.cocci warning and rename function 2020-08-24 18:14:23 -07:00
ef100_rx.h sfc: check hash is valid before using it 2020-08-14 14:07:16 -07:00
ef100_tx.c sfc: de-indirect TSO handling 2020-09-11 17:15:22 -07:00
ef100_tx.h sfc: make ef100 xmit_more handling look more like ef10's 2020-09-05 12:21:39 -07:00
efx.c sfc: advertise encapsulated offloads on EF10 2020-09-11 17:15:22 -07:00
efx.h sfc: check hash is valid before using it 2020-08-14 14:07:16 -07:00
efx_channels.c sfc: decouple TXQ type from label 2020-09-11 17:15:22 -07:00
efx_channels.h sfc: cleanups around efx_alloc_channel 2020-09-11 14:55:14 -07:00
efx_common.c sfc: advertise encapsulated offloads on EF10 2020-09-11 17:15:22 -07:00
efx_common.h sfc: advertise encapsulated offloads on EF10 2020-09-11 17:15:22 -07:00
enum.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
ethtool.c sfc: return errors from efx_mcdi_set_id_led, and de-indirect 2020-08-31 12:28:50 -07:00
ethtool_common.c sfc: decouple TXQ type from label 2020-09-11 17:15:22 -07:00
ethtool_common.h sfc: skeleton EF100 PF driver 2020-07-27 12:26:55 -07:00
farch.c sfc: de-indirect TSO handling 2020-09-11 17:15:22 -07:00
farch_regs.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
filter.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
io.h sfc_ef100: register accesses on EF100 2020-07-27 12:26:55 -07:00
mcdi.c sfc: return errors from efx_mcdi_set_id_led, and de-indirect 2020-08-31 12:28:50 -07:00
mcdi.h sfc: remove phy_op indirection 2020-09-07 14:46:13 -07:00
mcdi_filters.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
mcdi_filters.h sfc_ef100: helper function to set default RSS table of given size 2020-07-02 14:47:40 -07:00
mcdi_functions.c sfc: de-indirect TSO handling 2020-09-11 17:15:22 -07:00
mcdi_functions.h sfc: de-indirect TSO handling 2020-09-11 17:15:22 -07:00
mcdi_mon.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
mcdi_pcol.h sfc: update MCDI protocol headers 2020-06-29 17:37:48 -07:00
mcdi_port.c sfc: remove phy_op indirection 2020-09-07 14:46:13 -07:00
mcdi_port.h sfc: move NIC-specific mcdi_port declarations out of common header 2020-06-30 13:09:09 -07:00
mcdi_port_common.c sfc: coding style cleanups in mcdi_port_common.c 2020-09-08 20:14:33 -07:00
mcdi_port_common.h sfc: coding style cleanups in mcdi_port_common.c 2020-09-08 20:14:33 -07:00
mtd.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
net_driver.h sfc: implement encapsulated TSO on EF10 2020-09-11 17:15:22 -07:00
nic.c sfc: don't free_irq()s if they were never requested 2020-08-18 12:49:13 -07:00
nic.h sfc: de-indirect TSO handling 2020-09-11 17:15:22 -07:00
nic_common.h sfc: remove efx_tx_queue_partner 2020-09-05 12:21:40 -07:00
ptp.c sfc: select inner-csum-offload TX queues for skbs that need it 2020-09-11 17:15:22 -07:00
ptp.h sfc: split up nic.h 2020-06-29 17:37:48 -07:00
rx.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
rx_common.c sfc: null out channel->rps_flow_id after freeing it 2020-08-18 12:49:12 -07:00
rx_common.h sfc: commonise efx_sync_rx_buffer() 2020-06-30 13:09:09 -07:00
selftest.c sfc: define inner/outer csum offload TXQ types 2020-09-11 17:15:22 -07:00
selftest.h sfc: decouple TXQ type from label 2020-09-11 17:15:22 -07:00
siena.c sfc: return errors from efx_mcdi_set_id_led, and de-indirect 2020-08-31 12:28:50 -07:00
siena_sriov.c sfc: move channel alloc/removal code 2020-01-08 13:28:03 -08:00
siena_sriov.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
sriov.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
sriov.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
tx.c sfc: de-indirect TSO handling 2020-09-11 17:15:22 -07:00
tx.h sfc: select inner-csum-offload TX queues for skbs that need it 2020-09-11 17:15:22 -07:00
tx_common.c sfc: de-indirect TSO handling 2020-09-11 17:15:22 -07:00
tx_common.h sfc: skeleton EF100 PF driver 2020-07-27 12:26:55 -07:00
tx_tso.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
vfdi.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
workarounds.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00