Upgrade to kernel 6.18.53

configs/aarch64_defconfig

@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.53"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/aarch64_minimal_defconfig

@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.53"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/arm_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.53"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/arm_minimal_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.53"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/x86_64_defconfig

@@ -25,7 +25,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.53"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/x86_64_minimal_defconfig

@@ -25,7 +25,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.52"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.53"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

doc/ChangeLog.md

@@ -8,7 +8,7 @@ All notable changes to the project are documented in this file.
 
 ### Changes
 
-- Upgrade Linux kernel to 6.18.52 (LTS)
+- Upgrade Linux kernel to 6.18.53 (LTS)
 - Upgrade Buildroot to 2025.02.18 (LTS)
 - Upgrade FRR to 10.5.5
 - Add per-server `minpoll` and `maxpoll` options to the NTP client

patches/linux/6.18.52/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch → patches/linux/6.18.53/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch

@@ -1,7 +1,7 @@
-From 9826edc66db18973a8dd1eb9277a5711e9572692 Mon Sep 17 00:00:00 2001
+From b1bbb5f5d984f604a0fd2e3c98cdc6d7dbe460aa Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
-Subject: [PATCH 01/68] net: phy: marvell10g: Support firmware loading on
+Subject: [PATCH 01/73] net: phy: marvell10g: Support firmware loading on
  88X3310
 
 When probing, if a device is waiting for firmware to be loaded into

patches/linux/6.18.52/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch → patches/linux/6.18.53/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch

@@ -1,7 +1,7 @@
-From 86d6bd39a633095c9caf98f3234a42109eacc3bb Mon Sep 17 00:00:00 2001
+From dd1ec8cba3dc74881b4cda6ca9540d063dc0f00e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
-Subject: [PATCH 02/68] net: phy: marvell10g: Fix power-up when strapped to
+Subject: [PATCH 02/73] net: phy: marvell10g: Fix power-up when strapped to
  start powered down
 
 On devices which are hardware strapped to start powered down (PDSTATE

patches/linux/6.18.52/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch → patches/linux/6.18.53/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch

@@ -1,7 +1,7 @@
-From e706ef73a680c6c706362383cb2f629ef7561c8d Mon Sep 17 00:00:00 2001
+From c8e9c2ed03bedcb37bf8ff715dd6adb0a057bde9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
-Subject: [PATCH 03/68] net: phy: marvell10g: Add LED support for 88X3310
+Subject: [PATCH 03/73] net: phy: marvell10g: Add LED support for 88X3310
 
 Pickup the LEDs from the state in which the hardware reset or
 bootloader left them, but also support further configuration via

patches/linux/6.18.52/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch → patches/linux/6.18.53/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch

@@ -1,7 +1,7 @@
-From b3c816c87381ba9c72ae1a3fbb0d8496f6f88528 Mon Sep 17 00:00:00 2001
+From db670c361558c9a74db2217663d92145ae9e2c45 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
-Subject: [PATCH 04/68] net: phy: marvell10g: Support LEDs tied to a single
+Subject: [PATCH 04/73] net: phy: marvell10g: Support LEDs tied to a single
  media side
 
 In a combo-port setup, i.e. where both the copper and fiber interface

patches/linux/6.18.52/0005-net-phy-Do-not-resume-PHY-when-attaching.patch → patches/linux/6.18.53/0005-net-phy-Do-not-resume-PHY-when-attaching.patch

@@ -1,7 +1,7 @@
-From af666243f0b6f1734afc9fbb53a003f95816c35d Mon Sep 17 00:00:00 2001
+From 20bfff12f613ac4704573a40718eda0e8b48fb82 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
-Subject: [PATCH 05/68] net: phy: Do not resume PHY when attaching
+Subject: [PATCH 05/73] net: phy: Do not resume PHY when attaching
 
 The PHY should not start negotiating with its link-partner until
 explicitly instructed to do so.

patches/linux/6.18.52/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch → patches/linux/6.18.53/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch

@@ -1,7 +1,7 @@
-From c013a7cbe6391d2cb4f3f1a9756c7d2d6c0f1c76 Mon Sep 17 00:00:00 2001
+From 57d4c10ec1ef84bb9d836d9fda51bd7c361116a4 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
-Subject: [PATCH 06/68] net: bridge: avoid classifying unknown multicast as
+Subject: [PATCH 06/73] net: bridge: avoid classifying unknown multicast as
  mrouters_only
 
 Unknown multicast, MAC/IPv4/IPv6, should always be flooded according to
@@ -61,7 +61,7 @@ index c37e52e2f29a..0759bc37d6f0 100644
  		/* shouldn't be called with unsupported options */
  		WARN_ON(1);
 diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
-index 525d4eccd194..6278dfc9612f 100644
+index 3055a72959cb..0e5e7821d44c 100644
 --- a/net/bridge/br_device.c
 +++ b/net/bridge/br_device.c
 @@ -89,10 +89,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -84,14 +84,14 @@ index 525d4eccd194..6278dfc9612f 100644
 -			br_flood(br, skb, BR_PKT_MULTICAST, false, true, vid);
 +			br_flood(br, skb, brmctx, BR_PKT_MULTICAST, false, true, vid);
  	} else if ((dst = br_fdb_find_rcu(br, dest, vid)) != NULL) {
- 		br_forward(dst->dst, skb, false, true);
+ 		br_forward(READ_ONCE(dst->dst), skb, false, true);
  	} else {
 -		br_flood(br, skb, BR_PKT_UNICAST, false, true, vid);
 +		br_flood(br, skb, NULL, BR_PKT_UNICAST, false, true, vid);
  	}
  out:
  	rcu_read_unlock();
-@@ -528,6 +528,8 @@ void br_dev_setup(struct net_device *dev)
+@@ -527,6 +527,8 @@ void br_dev_setup(struct net_device *dev)
  	br->bridge_ageing_time = br->ageing_time = BR_DEFAULT_AGEING_TIME;
  	dev->max_mtu = ETH_MAX_MTU;
 
@@ -140,7 +140,7 @@ index dea09096ad0f..f0a613238e0d 100644
  				continue;
  			break;
 diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
-index 2cbae0f9ae1f..0c539bf4bebe 100644
+index ac0f56076e93..9af38febff25 100644
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
 @@ -186,9 +186,13 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
@@ -161,7 +161,7 @@ index 2cbae0f9ae1f..0c539bf4bebe 100644
  			    br->dev->flags & IFF_ALLMULTI) {
  				local_rcv = true;
 @@ -226,7 +230,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
- 		br_forward(dst->dst, skb, local_rcv, false);
+ 		br_forward(READ_ONCE(dst->dst), skb, local_rcv, false);
  	} else {
  		if (!mcast_hit)
 -			br_flood(br, skb, pkt_type, local_rcv, false, vid);
@@ -170,10 +170,10 @@ index 2cbae0f9ae1f..0c539bf4bebe 100644
  			br_multicast_flood(mdst, skb, brmctx, local_rcv, false);
  	}
 diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
-index c2a5af45df20..6fb2791714f0 100644
+index fda1f89ee22a..db837e27ed8a 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
-@@ -3837,6 +3837,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
+@@ -3838,6 +3838,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
  	u64_stats_update_end(&pstats->syncp);
  }
 
@@ -185,7 +185,7 @@ index c2a5af45df20..6fb2791714f0 100644
  static void br_multicast_pim(struct net_bridge_mcast *brmctx,
  			     struct net_bridge_mcast_port *pmctx,
  			     const struct sk_buff *skb)
-@@ -3883,7 +3888,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge_mcast *brmctx,
+@@ -3884,7 +3889,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge_mcast *brmctx,
 
  	if (err == -ENOMSG) {
  		if (!ipv4_is_local_multicast(ip_hdr(skb)->daddr)) {
@@ -195,7 +195,7 @@ index c2a5af45df20..6fb2791714f0 100644
  		} else if (pim_ipv4_all_pim_routers(ip_hdr(skb)->daddr)) {
  			if (ip_hdr(skb)->protocol == IPPROTO_PIM)
  				br_multicast_pim(brmctx, pmctx, skb);
-@@ -3952,7 +3958,8 @@ static int br_multicast_ipv6_rcv(struct net_bridge_mcast *brmctx,
+@@ -3953,7 +3959,8 @@ static int br_multicast_ipv6_rcv(struct net_bridge_mcast *brmctx,
 
  	if (err == -ENOMSG || err == -ENODATA) {
  		if (!ipv6_addr_is_ll_all_nodes(&ipv6_hdr(skb)->daddr))
@@ -206,18 +206,18 @@ index c2a5af45df20..6fb2791714f0 100644
  		    ipv6_addr_is_all_snoopers(&ipv6_hdr(skb)->daddr))
  			br_ip6_multicast_mrd_rcv(brmctx, pmctx, skb);
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index 2b451f3f72a6..2b8fc60022fb 100644
+index e4c8bc8576df..b99aa1d6a260 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -489,6 +489,7 @@ enum net_bridge_opts {
- 	BROPT_MST_ENABLED,
- 	BROPT_MDB_OFFLOAD_FAIL_NOTIFICATION,
+@@ -491,6 +491,7 @@ enum net_bridge_opts {
  	BROPT_FDB_LOCAL_VLAN_0,
+ 	BROPT_CFM_ENABLED,
+ 	BROPT_MRP_ENABLED,
 +	BROPT_MCAST_FLOOD_ALWAYS,
  };
 
  struct net_bridge {
-@@ -895,8 +896,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
+@@ -896,8 +897,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
  		bool local_rcv, bool local_orig);
  int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
  void br_flood(struct net_bridge *br, struct sk_buff *skb,
@@ -228,7 +228,7 @@ index 2b451f3f72a6..2b8fc60022fb 100644
 
  /* return true if both source port and dest port are isolated */
  static inline bool br_skb_isolated(const struct net_bridge_port *to,
-@@ -1435,6 +1436,19 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
+@@ -1426,6 +1427,19 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
  {
  }
 

patches/linux/6.18.52/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch → patches/linux/6.18.53/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch

@@ -1,7 +1,7 @@
-From 1de6056a0b005f506817590df83ae808b22ca7b8 Mon Sep 17 00:00:00 2001
+From 5b7261b4aad256863fc027d593e52aacdefa29e5 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
-Subject: [PATCH 07/68] net: bridge: Ignore router ports when forwarding L2
+Subject: [PATCH 07/73] net: bridge: Ignore router ports when forwarding L2
  multicast
 
 Multicast router ports are either statically configured or learned from
@@ -16,10 +16,10 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index 2b8fc60022fb..d8ab2557cd79 100644
+index b99aa1d6a260..93f3bbc37590 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -1097,7 +1097,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
+@@ -1088,7 +1088,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
  	if (skb->protocol == htons(ETH_P_IPV6))
  		return rcu_dereference(hlist_first_rcu(&brmctx->ip6_mc_router_list));
  #endif

patches/linux/6.18.52/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch → patches/linux/6.18.53/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch

@@ -1,7 +1,7 @@
-From 3dbcfb32f6003c238c6f687219517cb8201686ab Mon Sep 17 00:00:00 2001
+From 300b9c5afb41067e77339c1ea884711102f453be Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
-Subject: [PATCH 08/68] net: bridge: drop delay for applying strict multicast
+Subject: [PATCH 08/73] net: bridge: drop delay for applying strict multicast
  filtering
 
 This *local* patch drops the initial delay before applying strict multicast
@@ -24,10 +24,10 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
  2 files changed, 8 insertions(+), 38 deletions(-)
 
 diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
-index 6fb2791714f0..36826beae7f8 100644
+index db837e27ed8a..2ccfe3c7b20e 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
-@@ -1760,10 +1760,6 @@ static void br_ip6_multicast_querier_expired(struct timer_list *t)
+@@ -1761,10 +1761,6 @@ static void br_ip6_multicast_querier_expired(struct timer_list *t)
  }
  #endif
 
@@ -38,7 +38,7 @@ index 6fb2791714f0..36826beae7f8 100644
  static void br_multicast_select_own_querier(struct net_bridge_mcast *brmctx,
  					    struct br_ip *ip,
  					    struct sk_buff *skb)
-@@ -3258,12 +3254,8 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
+@@ -3259,12 +3255,8 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
 
  static void
  br_multicast_update_query_timer(struct net_bridge_mcast *brmctx,
@@ -52,7 +52,7 @@ index 6fb2791714f0..36826beae7f8 100644
  	mod_timer(&query->timer, jiffies + brmctx->multicast_querier_interval);
  }
 
-@@ -3454,13 +3446,12 @@ static void
+@@ -3455,13 +3447,12 @@ static void
  br_ip4_multicast_query_received(struct net_bridge_mcast *brmctx,
  				struct net_bridge_mcast_port *pmctx,
  				struct bridge_mcast_other_query *query,
@@ -68,7 +68,7 @@ index 6fb2791714f0..36826beae7f8 100644
  	br_ip4_multicast_mark_router(brmctx, pmctx);
  }
 
-@@ -3469,13 +3460,12 @@ static void
+@@ -3470,13 +3461,12 @@ static void
  br_ip6_multicast_query_received(struct net_bridge_mcast *brmctx,
  				struct net_bridge_mcast_port *pmctx,
  				struct bridge_mcast_other_query *query,
@@ -84,7 +84,7 @@ index 6fb2791714f0..36826beae7f8 100644
  	br_ip6_multicast_mark_router(brmctx, pmctx);
  }
  #endif
-@@ -3529,7 +3519,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
+@@ -3530,7 +3520,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
 
  		br_ip4_multicast_query_received(brmctx, pmctx,
  						&brmctx->ip4_other_query,
@@ -93,7 +93,7 @@ index 6fb2791714f0..36826beae7f8 100644
  		goto out;
  	}
 
-@@ -3617,7 +3607,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
+@@ -3618,7 +3608,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
 
  		br_ip6_multicast_query_received(brmctx, pmctx,
  						&brmctx->ip6_other_query,
@@ -102,7 +102,7 @@ index 6fb2791714f0..36826beae7f8 100644
  		goto out;
  	} else if (!group) {
  		goto out;
-@@ -4123,8 +4113,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
+@@ -4124,8 +4114,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
  		    br_ip4_multicast_local_router_expired, 0);
  	timer_setup(&brmctx->ip4_other_query.timer,
  		    br_ip4_multicast_querier_expired, 0);
@@ -111,7 +111,7 @@ index 6fb2791714f0..36826beae7f8 100644
  	timer_setup(&brmctx->ip4_own_query.timer,
  		    br_ip4_multicast_query_expired, 0);
  #if IS_ENABLED(CONFIG_IPV6)
-@@ -4132,8 +4120,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
+@@ -4133,8 +4121,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
  		    br_ip6_multicast_local_router_expired, 0);
  	timer_setup(&brmctx->ip6_other_query.timer,
  		    br_ip6_multicast_querier_expired, 0);
@@ -120,7 +120,7 @@ index 6fb2791714f0..36826beae7f8 100644
  	timer_setup(&brmctx->ip6_own_query.timer,
  		    br_ip6_multicast_query_expired, 0);
  #endif
-@@ -4268,12 +4254,10 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)
+@@ -4269,12 +4255,10 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)
  {
  	timer_delete_sync(&brmctx->ip4_mc_router_timer);
  	timer_delete_sync(&brmctx->ip4_other_query.timer);
@@ -133,7 +133,7 @@ index 6fb2791714f0..36826beae7f8 100644
  	timer_delete_sync(&brmctx->ip6_own_query.timer);
  #endif
  }
-@@ -4748,8 +4732,6 @@ EXPORT_SYMBOL_GPL(br_multicast_router);
+@@ -4747,8 +4731,6 @@ EXPORT_SYMBOL_GPL(br_multicast_router);
 
  int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
  {
@@ -142,7 +142,7 @@ index 6fb2791714f0..36826beae7f8 100644
  	val = !!val;
 
  	spin_lock_bh(&brmctx->br->multicast_lock);
-@@ -4760,19 +4742,9 @@ int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
+@@ -4759,19 +4741,9 @@ int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
  	if (!val)
  		goto unlock;
 
@@ -163,7 +163,7 @@ index 6fb2791714f0..36826beae7f8 100644
  #endif
 
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index d8ab2557cd79..68ddec76d820 100644
+index 93f3bbc37590..ec6a85023b5a 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -80,7 +80,6 @@ struct bridge_mcast_own_query {
@@ -174,7 +174,7 @@ index d8ab2557cd79..68ddec76d820 100644
  };
 
  /* selected querier */
-@@ -1175,8 +1174,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
+@@ -1166,8 +1165,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
  		own_querier_enabled = false;
  	}