mirror_ubuntu-kernels/drivers/net/ethernet/marvell/prestera
Jakub Kicinski 4d016ae42e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/intel/igc/igc_main.c
  06b412589e ("igc: Add lock to safeguard global Qbv variables")
  d3750076d4 ("igc: Add TransmissionOverrun counter")

drivers/net/ethernet/microsoft/mana/mana_en.c
  a7dfeda6fd ("net: mana: Fix MANA VF unload when hardware is unresponsive")
  a9ca9f9cef ("page_pool: split types and declarations from page_pool.h")
  92272ec410 ("eth: add missing xdp.h includes in drivers")

net/mptcp/protocol.h
  511b90e392 ("mptcp: fix disconnect vs accept race")
  b8dc6d6ce9 ("mptcp: fix rcv buffer auto-tuning")

tools/testing/selftests/net/mptcp/mptcp_join.sh
  c8c101ae39 ("selftests: mptcp: join: fix 'implicit EP' test")
  03668c65d1 ("selftests: mptcp: join: rework detailed report")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-10 14:10:53 -07:00
..
Kconfig net: marvell: prestera: add phylink support 2022-07-20 10:24:40 +01:00
Makefile net: prestera: acl: extract matchall logic into a separate file 2022-08-26 10:04:54 +01:00
prestera_acl.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2022-10-03 17:44:18 -07:00
prestera_acl.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2022-10-03 17:44:18 -07:00
prestera_counter.c net: prestera: add counter HW API 2021-11-30 12:26:01 +00:00
prestera_counter.h net: prestera: add counter HW API 2021-11-30 12:26:01 +00:00
prestera_devlink.c net: devlink: let the core report the driver name instead of the drivers 2022-11-30 21:49:38 -08:00
prestera_devlink.h net: remove unused ndo_get_devlink_port 2022-11-03 20:48:36 -07:00
prestera_dsa.c net: marvell: prestera: devlink: add traps/groups implementation 2021-06-14 13:04:25 -07:00
prestera_dsa.h net: marvell: prestera: devlink: add traps/groups implementation 2021-06-14 13:04:25 -07:00
prestera_ethtool.c net: ethernet: move from strlcpy with unused retval to strscpy 2022-08-31 14:11:26 -07:00
prestera_ethtool.h net: marvell: prestera: add phylink support 2022-07-20 10:24:40 +01:00
prestera_flow.c net: prestera: manage matchall and flower priorities 2022-08-26 10:04:54 +01:00
prestera_flow.h net: prestera: manage matchall and flower priorities 2022-08-26 10:04:54 +01:00
prestera_flower.c net: flow_dissector: Use 64bits for used_keys 2023-07-31 09:11:24 +01:00
prestera_flower.h net: prestera: manage matchall and flower priorities 2022-08-26 10:04:54 +01:00
prestera_hw.c net: marvell: prestera: Add router nexthops ABI 2022-10-03 17:14:52 -07:00
prestera_hw.h net: marvell: prestera: Add router nexthops ABI 2022-10-03 17:14:52 -07:00
prestera_main.c net: prestera: update PCS driver to use neg_mode 2023-06-22 19:41:01 -07:00
prestera_matchall.c prestera: matchall: do not rollback if rule exists 2022-10-07 08:48:34 +01:00
prestera_matchall.h net: prestera: manage matchall and flower priorities 2022-08-26 10:04:54 +01:00
prestera_pci.c prestera: fix fallback to previous version on same major version 2023-08-03 10:56:49 -07:00
prestera_router_hw.c net: marvell: prestera: Fix a NULL vs IS_ERR() check in some functions 2022-11-29 12:29:46 +01:00
prestera_router_hw.h net: marvell: prestera: Add length macros for prestera_ip_addr 2022-10-03 17:14:53 -07:00
prestera_router.c net: marvell: prestera: fix handling IPv4 routes with nhid 2023-08-07 19:20:50 -07:00
prestera_rxtx.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
prestera_rxtx.h
prestera_span.c net: prestera: span: do not unbind things things that were never bound 2022-10-10 17:59:53 -07:00
prestera_span.h net: prestera: add support for egress traffic mirroring 2022-08-26 10:04:54 +01:00
prestera_switchdev.c net: marvell: prestera: implement br_port_locked flag offloading 2022-08-24 12:55:47 +01:00
prestera_switchdev.h net: bridge: switchdev: let drivers inform which bridge ports are offloaded 2021-07-22 00:26:23 -07:00
prestera.h net: marvell: prestera: Propagate nh state from hw to kernel 2022-10-03 17:14:53 -07:00