Skip to contentSkip to conversation

Patch "bridge: Allow set bridge ageing time when switchdev disabled" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Apr 16, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

bridge: Allow set bridge ageing time when switchdev disabled

to the 4.4-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-allow-set-bridge-ageing-time-when-switchdev-disabled.patch
and it can be found in the queue-4.4 subdirectory.

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

Quoted 1 line

From foo@baz Sat Apr 16 10:02:53 PDT 2016

From: Haishuang Yan <[email protected]>
Date: Tue, 29 Mar 2016 18:48:08 +0800
Subject: bridge: Allow set bridge ageing time when switchdev disabled

From: Haishuang Yan <[email protected]>

[ Upstream commit 5e263f712691615fb802f06c98d7638c378f5d11 ]

When NET_SWITCHDEV=n, switchdev_port_attr_set will return -EOPNOTSUPP, we should ignore this error code and continue to set the ageing time.

Fixes c62987bbd8a1 ("bridge: push bridge setting ageing_time down to switchdev")
---
 net/bridge/br_stp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/bridge/br_stp.c +1 -1
@@ -586,7 +586,7 @@ int br_set_ageing_time(struct net_bridge
 	int err;
 
 	err = switchdev_port_attr_set(br->dev, &attr);
-	if (err)
+	if (err && err != -EOPNOTSUPP)
 		return err;
 
 	br->ageing_time = t;

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

queue-4.4/bridge-allow-set-bridge-ageing-time-when-switchdev-disabled.patch queue-4.4/ipv4-l2tp-fix-a-potential-issue-in-l2tp_ip_recv.patch queue-4.4/ipv6-l2tp-fix-a-potential-issue-in-l2tp_ip6_recv.patch