Jakub Kicinski 7ff57803d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/sfc/tc.c fa165e1949 ("sfc: don't unregister flow_indr if it was never registered") 3bf969e88a ("sfc: add MAE table machinery for conntrack table") https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/ No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-08-18 12:44:56 -07:00
..
falcon	sfc: fix field-spanning memcpy in selftest	2023-07-31 14:27:53 -07:00
siena	sfc: fix field-spanning memcpy in selftest	2023-07-31 14:27:53 -07:00
bitfield.h	sfc: offload left-hand side rules for conntrack	2023-08-09 11:14:38 +01:00
ef10.c	sfc: Remove struct efx_special_buffer	2023-07-28 09:54:17 +01:00
ef10_regs.h
ef10_sriov.c
ef10_sriov.h	sfc: Remove some NIC type indirections that are no longer needed	2023-07-28 09:54:17 +01:00
ef100.c
ef100.h
ef100_ethtool.c
ef100_ethtool.h
ef100_netdev.c	sfc: neighbour lookup for TC encap action offload	2023-06-10 00:11:49 -07:00
ef100_netdev.h
ef100_nic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-18 12:44:56 -07:00
ef100_nic.h
ef100_regs.h
ef100_rep.c
ef100_rep.h
ef100_rx.c
ef100_rx.h
ef100_sriov.c
ef100_sriov.h
ef100_tx.c	sfc: Remove struct efx_special_buffer	2023-07-28 09:54:17 +01:00
ef100_tx.h	sfc: use budget for TX completions	2023-06-17 00:06:55 -07:00
efx.c	sfc: Remove support for siena high priority queue	2023-07-28 09:54:17 +01:00
efx.h	sfc: Remove support for siena high priority queue	2023-07-28 09:54:17 +01:00
efx_channels.c	sfc: Remove struct efx_special_buffer	2023-07-28 09:54:17 +01:00
efx_channels.h
efx_common.c	sfc: Miscellaneous comment removals	2023-07-28 09:54:18 +01:00
efx_common.h
efx_devlink.c	sfc: support for devlink port requires MAE access	2023-06-29 11:10:27 -07:00
efx_devlink.h
enum.h
ethtool.c
ethtool_common.c
ethtool_common.h
filter.h	sfc: Miscellaneous comment removals	2023-07-28 09:54:18 +01:00
io.h	sfc: Cleanups in io.h	2023-07-28 09:54:18 +01:00
Kconfig	sfc: add CONFIG_INET dependency for TC offload	2023-06-20 20:37:16 -07:00
mae.c	sfc: offload left-hand side rules for conntrack	2023-08-09 11:14:38 +01:00
mae.h	sfc: offload left-hand side rules for conntrack	2023-08-09 11:14:38 +01:00
mae_counter_format.h
Makefile	sfc: functions to register for conntrack zone offload	2023-08-09 11:14:37 +01:00
mcdi.c	sfc: Remove some NIC type indirections that are no longer needed	2023-07-28 09:54:17 +01:00
mcdi.h	sfc: offload left-hand side rules for conntrack	2023-08-09 11:14:38 +01:00
mcdi_filters.c
mcdi_filters.h
mcdi_functions.c	sfc: Remove struct efx_special_buffer	2023-07-28 09:54:17 +01:00
mcdi_functions.h
mcdi_mon.c
mcdi_pcol.h
mcdi_pcol_mae.h
mcdi_port.c
mcdi_port.h
mcdi_port_common.c	sfc: Filter cleanups for Falcon and Siena	2023-07-28 09:54:17 +01:00
mcdi_port_common.h
mtd.c
net_driver.h	sfc: Remove struct efx_special_buffer	2023-07-28 09:54:17 +01:00
nic.c	sfc: Cleanups in io.h	2023-07-28 09:54:18 +01:00
nic.h	sfc: Remove siena_nic_data and stats	2023-07-28 09:54:17 +01:00
nic_common.h	sfc: Miscellaneous comment removals	2023-07-28 09:54:18 +01:00
ptp.c	sfc: Remove PTP code for Siena	2023-07-28 09:54:17 +01:00
ptp.h
rx.c
rx_common.c
rx_common.h
selftest.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-03 14:34:37 -07:00
selftest.h
sriov.c
sriov.h
tc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-18 12:44:56 -07:00
tc.h	sfc: offload left-hand side rules for conntrack	2023-08-09 11:14:38 +01:00
tc_bindings.c	sfc: neighbour lookup for TC encap action offload	2023-06-10 00:11:49 -07:00
tc_bindings.h	sfc: do not try to call tc functions when CONFIG_SFC_SRIOV=n	2023-06-16 09:12:18 +01:00
tc_conntrack.c	sfc: handle non-zero chain_index on TC rules	2023-08-09 11:14:38 +01:00
tc_conntrack.h	sfc: handle non-zero chain_index on TC rules	2023-08-09 11:14:38 +01:00
tc_counters.c	sfc: offload conntrack flow entries (match only) from CT zones	2023-08-09 11:14:38 +01:00
tc_counters.h	sfc: offload conntrack flow entries (match only) from CT zones	2023-08-09 11:14:38 +01:00
tc_encap_actions.c	sfc: fix uninitialized variable use	2023-06-20 20:37:16 -07:00
tc_encap_actions.h	sfc: do not try to call tc functions when CONFIG_SFC_SRIOV=n	2023-06-16 09:12:18 +01:00
tx.c	sfc: Remove support for siena high priority queue	2023-07-28 09:54:17 +01:00
tx.h
tx_common.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-06-22 18:40:38 -07:00
tx_common.h	sfc: use budget for TX completions	2023-06-17 00:06:55 -07:00
tx_tso.c	sfc: Remove struct efx_special_buffer	2023-07-28 09:54:17 +01:00
workarounds.h	sfc: Remove EFX_REV_SIENA_A0	2023-07-28 09:54:17 +01:00