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_stp.c | |
| parent | bridge: mrp: Integrate MRP into the bridge (diff) | |
| download | linux-dev-419dba8a49d7cc355e5b495d20dea8217369ed63.tar.xz linux-dev-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 '')
| -rw-r--r-- | net/bridge/br_stp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index 1f14b8455345..3e88be7aa269 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -36,6 +36,12 @@ void br_set_state(struct net_bridge_port *p, unsigned int state) }; int err; + /* Don't change the state of the ports if they are driven by a different + * protocol. + */ + if (p->flags & BR_MRP_AWARE) + return; + p->state = state; err = switchdev_port_attr_set(p->dev, &attr); if (err && err != -EOPNOTSUPP) |