Jakub Kicinski cf1ca1f66d Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/ip_gre.c
  17af420545 ("erspan: make sure erspan_base_hdr is present in skb->head")
  5832c4a77d ("ip_tunnel: convert __be16 tunnel flags to bitmaps")
https://lore.kernel.org/all/20240402103253.3b54a1cf@canb.auug.org.au/

Adjacent changes:

net/ipv6/ip6_fib.c
  d21d40605b ("ipv6: Fix infinite recursion in fib6_dump_done().")
  5fc68320c1 ("ipv6: remove RTNL protection from inet6_dump_fib()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-04-04 18:01:07 -07:00

..

netfilter

netfilter: validate user input for expected length

2024-04-04 09:39:52 -07:00

br_arp_nd_proxy.c

bridge: Add per-{Port, VLAN} neighbor suppression data path support

2023-04-21 08:25:50 +01:00

br_cfm_netlink.c

bridge: cfm: fix enum typo in br_cc_ccm_tx_parse

2023-12-26 22:38:13 +00:00

br_cfm.c

bridge: cfm: remove redundant return

2021-06-22 10:35:15 -07:00

br_device.c

net: bridge: Exit if multicast_init_stats fails

2024-02-28 20:15:32 -08:00

br_fdb.c

net: bridge: Use KMEM_CACHE instead of kmem_cache_create

2024-01-31 16:39:46 -08:00

br_forward.c

net: bridge: use DEV_STATS_INC()

2023-09-19 13:35:15 +02:00

br_if.c

net: bridge: keep ports without IFF_UNICAST_FLT in BR_PROMISC mode

2023-07-03 09:11:34 +01:00

br_input.c

bridge: mcast: Rename MDB entry get function

2023-10-27 10:51:41 +01:00

br_ioctl.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2021-12-31 14:35:40 +00:00

br_mdb.c

bridge: mdb: Add MDB bulk deletion support

2023-12-20 11:27:20 +00:00

br_mrp_netlink.c

bridge: mrp: Use hlist_head instead of list_head for mrp

2020-11-09 16:42:12 -08:00

br_mrp_switchdev.c

bridge: mrp: Extend br_mrp_switchdev to detect better the errors

2021-02-16 14:47:46 -08:00

br_mrp.c

net: bridge: mrp: Update the Test frames for MRA

2021-06-28 15:46:10 -07:00

br_mst.c

net: bridge: mst: Add helper to query a port's MST state

2022-03-17 16:49:58 -07:00

br_multicast_eht.c

treewide: Convert del_timer*() to timer_shutdown*()

2022-12-25 13:38:09 -08:00

br_multicast.c

treewide: update LLVM Bugzilla links

2024-02-22 15:38:51 -08:00

br_netfilter_hooks.c

netfilter: bridge: confirm multicast packets before passing them up the stack

2024-02-29 00:22:44 +01:00

br_netfilter_ipv6.c

netfilter: bridge: replace physindev with physinif in nf_bridge_info

2024-01-17 12:02:49 +01:00

br_netlink_tunnel.c

net: bridge: Set strict_start_type at two policies

2023-02-06 08:48:25 +00:00

br_netlink.c

net-sysfs: convert dev->operstate reads to lockless ones

2024-02-14 11:20:13 +00:00

br_nf_core.c

net: dst: Switch to rcuref_t reference counting

2023-03-28 18:52:28 -07:00

br_private_cfm.h

bridge: cfm: Kernel space implementation of CFM. CCM frame RX added.

2020-10-29 18:39:43 -07:00

br_private_mcast_eht.h

net: bridge: multicast: use multicast contexts instead of bridge or port

2021-07-20 05:41:19 -07:00

br_private_mrp.h

net: bridge: mrp: Update the Test frames for MRA

2021-06-28 15:46:10 -07:00

br_private_stp.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_private_tunnel.h

bridge: always declare tunnel functions

2023-05-17 21:28:58 -07:00

br_private.h

bridge: mcast: fix disabled snooping after long uptime

2024-01-30 18:06:56 -08:00

br_stp_bpdu.c

net: bridge: add STP xstats

2019-12-14 20:02:36 -08:00

br_stp_if.c

net: use eth_hw_addr_set()

2021-10-02 14:18:25 +01:00

br_stp_timer.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_stp.c

net: bridge: mst: Multiple Spanning Tree (MST) mode

2022-03-17 16:49:57 -07:00

br_switchdev.c

net: bridge: switchdev: Ensure deferred event delivery on unoffload

2024-02-16 09:36:37 +00:00

br_sysfs_br.c

bridge: Fix flushing of dynamic FDB entries

2022-11-02 20:47:09 -07:00

br_sysfs_if.c

bridge: move from strlcpy with unused retval to strscpy

2022-08-22 17:57:30 -07:00

br_vlan_options.c

bridge: vlan: Allow setting VLAN neighbor suppression state

2023-04-21 08:25:50 +01:00

br_vlan_tunnel.c

ip_tunnel: convert __be16 tunnel flags to bitmaps

2024-04-01 10:49:28 +01:00

br_vlan.c

bridge: vlan: use synchronize_net() when holding RTNL

2024-02-12 12:17:02 +00:00

br.c

bridge: use exit_batch_rtnl() method

2024-02-07 18:55:12 -08:00

Kconfig

bridge: cfm: Add BRIDGE_CFM to Kconfig.

2020-10-29 18:39:43 -07:00

Makefile

net: bridge: mst: Multiple Spanning Tree (MST) mode

2022-03-17 16:49:57 -07:00