Patch "bridge: start hello_timer when enabling KERNEL_STP in br_stp_start" has been added to the 4.11-stable tree

This is a note to let you know that I've just added the patch titled

bridge: start hello_timer when enabling KERNEL_STP in br_stp_start

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
bridge-start-hello_timer-when-enabling-kernel_stp-in-br_stp_start.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Xin Long <[email protected]>
Date: Fri, 19 May 2017 22:20:29 +0800
Subject: bridge: start hello_timer when enabling KERNEL_STP in br_stp_start

From: Xin Long <[email protected]>

[ Upstream commit 6d18c732b95c0a9d35e9f978b4438bba15412284 ]

Since commit 76b91c32dd86 ("bridge: stp: when using userspace stp stop kernel hello and hold timers"), bridge would not start hello_timer if stp_enabled is not KERNEL_STP when br_dev_open.

The problem is even if users set stp_enabled with KERNEL_STP later, the timer will still not be started. It causes that KERNEL_STP can not really work. Users have to re-ifup the bridge to avoid this.

This patch is to fix it by starting br->hello_timer when enabling KERNEL_STP in br_stp_start.

As an improvement, it's also to start hello_timer again only when br->stp_enabled is KERNEL_STP in br_hello_timer_expired, there is no reason to start the timer again when it's NO_STP.

---
 net/bridge/br_stp_if.c    |    1 +
 net/bridge/br_stp_timer.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

@@ -179,6 +179,7 @@ static void br_stp_start(struct net_brid
 		br_debug(br, "using kernel STP\n");
 
 		/* To start timers on any ports left in blocking */
+		mod_timer(&br->hello_timer, jiffies + br->hello_time);
 		br_port_state_selection(br);
 	}
 

@@ -40,7 +40,7 @@ static void br_hello_timer_expired(unsig
 	if (br->dev->flags & IFF_UP) {
 		br_config_bpdu_generation(br);
 
-		if (br->stp_enabled != BR_USER_STP)
+		if (br->stp_enabled == BR_KERNEL_STP)
 			mod_timer(&br->hello_timer,
 				  round_jiffies(jiffies + br->hello_time));
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/sctp-fix-src-address-selection-if-using-secondary-addresses-for-ipv6.patch queue-4.11/bridge-start-hello_timer-when-enabling-kernel_stp-in-br_stp_start.patch queue-4.11/sctp-fix-icmp-processing-if-skb-is-non-linear.patch