linux-stable/drivers/net/ethernet/sfc
Jakub Kicinski 35b1b1fd96 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.

Conflicts:

net/dsa/port.c
  9945c1fb03 ("net: dsa: fix older DSA drivers using phylink")
  a88dd75384 ("net: dsa: remove legacy_pre_march2020 detection")
https://lore.kernel.org/all/20230731102254.2c9868ca@canb.auug.org.au/

net/xdp/xsk.c
  3c5b4d69c3 ("net: annotate data-races around sk->sk_mark")
  b7f72a30e9 ("xsk: introduce wrappers and helpers for supporting multi-buffer in Tx path")
https://lore.kernel.org/all/20230731102631.39988412@canb.auug.org.au/

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  37b61cda9c ("bnxt: don't handle XDP in netpoll")
  2b56b3d992 ("eth: bnxt: handle invalid Tx completions more gracefully")
https://lore.kernel.org/all/20230801101708.1dc7faac@canb.auug.org.au/

Adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
  62da08331f ("net/mlx5e: Set proper IPsec source port in L4 selector")
  fbd517549c ("net/mlx5e: Add function to get IPsec offload namespace")

drivers/net/ethernet/sfc/selftest.c
  55c1528f9b ("sfc: fix field-spanning memcpy in selftest")
  ae9d445cd4 ("sfc: Miscellaneous comment removals")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-03 14:34:37 -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
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 sfc_ef100: Drop redundant pci_disable_pcie_error_reporting() 2023-03-08 23:34:39 -08:00
ef100.h
ef100_ethtool.c sfc: remove 'log-tc-errors' ethtool private flag 2022-10-19 13:00:05 -07:00
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 sfc: Remove struct efx_special_buffer 2023-07-28 09:54:17 +01:00
ef100_nic.h sfc: add support for devlink port_function_hw_addr_get in ef100 2023-02-16 12:03:13 +01:00
ef100_regs.h
ef100_rep.c sfc: add support for devlink port_function_hw_addr_get in ef100 2023-02-16 12:03:13 +01:00
ef100_rep.h sfc: add support for devlink port_function_hw_addr_get in ef100 2023-02-16 12:03:13 +01:00
ef100_rx.c sfc: add ability for extra channels to receive raw RX buffers 2022-11-16 09:07:02 +00:00
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 sfc: add devlink port support for ef100 2023-02-16 12:03:12 +01:00
enum.h
ethtool.c
ethtool_common.c sfc: remove 'log-tc-errors' ethtool private flag 2022-10-19 13:00:05 -07:00
ethtool_common.h sfc: remove 'log-tc-errors' ethtool private flag 2022-10-19 13:00:05 -07:00
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: MAE functions to create/update/delete encap headers 2023-06-10 00:11:49 -07:00
mae.h sfc: MAE functions to create/update/delete encap headers 2023-06-10 00:11:49 -07:00
mae_counter_format.h sfc: add extra RX channel to receive MAE counter updates on ef100 2022-11-16 09:07:02 +00:00
Makefile sfc: some plumbing towards TC encap action offload 2023-06-10 00:11:49 -07: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: support offloading TC VLAN push/pop actions to the MAE 2023-03-10 21:28:59 -08: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 sfc: add ability for an RXQ to grant credits on refill 2022-11-16 09:07:02 +00:00
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 net: flow_dissector: Use 64bits for used_keys 2023-07-31 09:11:24 +01:00
tc.h sfc: keep alive neighbour entries while a TC encap action is using them 2023-06-22 19:54:14 -07: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_counters.c sfc: keep alive neighbour entries while a TC encap action is using them 2023-06-22 19:54:14 -07:00
tc_counters.h sfc: keep alive neighbour entries while a TC encap action is using them 2023-06-22 19:54:14 -07: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