diff options
| author | Horatiu Vultur <horatiu.vultur@microchip.com> | 2020-04-26 15:22:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-27 11:40:25 -0700 |
| commit | 419dba8a49d7cc355e5b495d20dea8217369ed63 (patch) | |
| tree | 4e63a0779364f24e8907eade08443338123a2f78 /net/bridge/br_ioctl.c | |
| parent | 6536993371fab3de4e8379649b60e94d03e6ff37 (diff) | |
| download | linux-419dba8a49d7cc355e5b495d20dea8217369ed63.tar.gz | |
net: bridge: Add checks for enabling the STP.
It is not possible to have the MRP and STP running at the same time on the
bridge, therefore add check when enabling the STP to check if MRP is already
enabled. In that case return error.
Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_ioctl.c')
| -rw-r--r-- | net/bridge/br_ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index ae22d784b88aa6..5e71fc8b826fc3 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c @@ -242,8 +242,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN)) return -EPERM; - br_stp_set_enabled(br, args[1]); - ret = 0; + ret = br_stp_set_enabled(br, args[1], NULL); break; case BRCTL_SET_BRIDGE_PRIORITY: |