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

Merge in the fixes we had queued in case there was another -rc.

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

2021-11-01 20:05:14 -07:00

..

netfilter

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

2021-11-01 12:59:58 +00:00

br_arp_nd_proxy.c

…

br_cfm_netlink.c

…

br_cfm.c

…

br_device.c

net: bridge: move bridge ioctls out of .ndo_do_ioctl

2021-07-27 20:11:45 +01:00

br_fdb.c

net: bridge: move br_fdb_replay inside br_switchdev.c

2021-10-27 14:54:02 +01:00

br_forward.c

net: bridge: fix build when setting skb->offload_fwd_mark with CONFIG_NET_SWITCHDEV=n

2021-07-24 21:48:26 +01:00

br_if.c

net: bridge: rename br_fdb_insert to br_fdb_add_local

2021-10-27 14:54:02 +01:00

br_input.c

net: bridge: change return type of br_handle_ingress_vlan_tunnel

2021-08-24 16:51:09 -07:00

br_ioctl.c

net: make use of helper netif_is_bridge_master()

2021-10-16 15:02:56 +01:00

br_mdb.c

net: bridge: mdb: move all switchdev logic to br_switchdev.c

2021-10-28 20:05:57 -07:00

br_mrp_netlink.c

…

br_mrp_switchdev.c

…

br_mrp.c

…

br_multicast_eht.c

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

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

br_multicast.c

net: bridge: mcast: Associate the seqcount with its protecting lock.

2021-09-28 17:30:36 -07:00

br_netfilter_hooks.c

net: make use of helper netif_is_bridge_master()

2021-10-16 15:02:56 +01:00

br_netfilter_ipv6.c

…

br_netlink_tunnel.c

…

br_netlink.c

net: make use of helper netif_is_bridge_master()

2021-10-16 15:02:56 +01:00

br_nf_core.c

…

br_private_cfm.h

…

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

…

br_private_stp.h

…

br_private_tunnel.h

net: bridge: change return type of br_handle_ingress_vlan_tunnel

2021-08-24 16:51:09 -07:00

br_private.h

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

2021-11-01 20:05:14 -07:00

br_stp_bpdu.c

…

br_stp_if.c

net: use eth_hw_addr_set()

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

br_stp_timer.c

…

br_stp.c

…

br_switchdev.c

net: bridge: switchdev: consistent function naming

2021-10-28 20:05:57 -07:00

br_sysfs_br.c

net: bridge: vlan: add support for mcast router global option

2021-08-11 13:34:41 +01:00

br_sysfs_if.c

net: bridge: mcast: br_multicast_set_port_router takes multicast context as argument

2021-08-20 15:00:35 +01:00

br_vlan_options.c

net: bridge: vlan: convert mcast router global option to per-vlan entry

2021-08-20 15:00:35 +01:00

br_vlan_tunnel.c

net: bridge: change return type of br_handle_ingress_vlan_tunnel

2021-08-24 16:51:09 -07:00

br_vlan.c

net: bridge: move br_vlan_replay to br_switchdev.c

2021-10-28 20:05:57 -07:00

br.c

net: make use of helper netif_is_bridge_master()

2021-10-16 15:02:56 +01:00

Kconfig

…

Makefile

…