Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bridge: Allow set bridge ageing time when switchdev disabled

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")
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>

authored by

Haishuang Yan and committed by
David S. Miller
5e263f71 e84810c7

+1 -1
+1 -1
net/bridge/br_stp.c
··· 582 582 int err; 583 583 584 584 err = switchdev_port_attr_set(br->dev, &attr); 585 - if (err) 585 + if (err && err != -EOPNOTSUPP) 586 586 return err; 587 587 588 588 br->ageing_time = t;