evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bridge: Allow set bridge ageing time when switchdev disabled

Browse source 
[ 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: c62987bbd8 ("bridge: push bridge setting ageing_time down to switchdev")
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Acked-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Haishuang Yan 2016-03-29 18:48:08 +08:00 • committed by Greg Kroah-Hartman
parent 26dd42ebff
commit df371b1963
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/bridge/br_stp.c
View file

@ -586,7 +586,7 @@ int br_set_ageing_time(struct net_bridge *br, u32 ageing_time)
int err; int err;
err = switchdev_port_attr_set(br->dev, &attr); err = switchdev_port_attr_set(br->dev, &attr);
if (err) if (err && err != -EOPNOTSUPP)
return err; return err;
br->ageing_time = t; br->ageing_time = t;