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_private.h | |
| parent | 6536993371fab3de4e8379649b60e94d03e6ff37 (diff) | |
| download | kernel_replicant_linux-419dba8a49d7cc355e5b495d20dea8217369ed63.tar.gz kernel_replicant_linux-419dba8a49d7cc355e5b495d20dea8217369ed63.tar.bz2 kernel_replicant_linux-419dba8a49d7cc355e5b495d20dea8217369ed63.zip | |
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_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 5835828320b6..c35647cb138a 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -1283,7 +1283,8 @@ int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time); /* br_stp_if.c */ void br_stp_enable_bridge(struct net_bridge *br); void br_stp_disable_bridge(struct net_bridge *br); -void br_stp_set_enabled(struct net_bridge *br, unsigned long val); +int br_stp_set_enabled(struct net_bridge *br, unsigned long val, + struct netlink_ext_ack *extack); void br_stp_enable_port(struct net_bridge_port *p); void br_stp_disable_port(struct net_bridge_port *p); bool br_stp_recalculate_bridge_id(struct net_bridge *br); |