Skip to content

Commit df371b1

Browse files
Haishuang Yangregkh
Haishuang Yan
authored andcommitted
bridge: Allow set bridge ageing time when switchdev disabled
[ Upstream commit 5e263f7 ] 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: c62987b ("bridge: push bridge setting ageing_time down to switchdev") Signed-off-by: Haishuang Yan <[email protected]> Acked-by: Ido Schimmel <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 26dd42e commit df371b1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/bridge/br_stp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ int br_set_ageing_time(struct net_bridge *br, u32 ageing_time)
586586
int err;
587587

588588
err = switchdev_port_attr_set(br->dev, &attr);
589-
if (err)
589+
if (err && err != -EOPNOTSUPP)
590590
return err;
591591

592592
br->ageing_time = t;

0 commit comments

Comments
 (0)