diff options
author | Horatiu Vultur <horatiu.vultur@microchip.com> | 2020-04-26 15:22:07 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-04-27 20:40:25 +0200 |
commit | 6536993371fab3de4e8379649b60e94d03e6ff37 (patch) | |
tree | f7d09710caa35c5a376141cbc43c24ab87517351 /net/bridge/br_netlink.c | |
parent | bridge: mrp: Implement netlink interface to configure MRP (diff) | |
download | linux-6536993371fab3de4e8379649b60e94d03e6ff37.tar.xz linux-6536993371fab3de4e8379649b60e94d03e6ff37.zip |
bridge: mrp: Integrate MRP into the bridge
To integrate MRP into the bridge, the bridge needs to do the following:
- detect if the MRP frame was received on MRP ring port in that case it would be
processed otherwise just forward it as usual.
- enable parsing of MRP
- before whenever the bridge was set up, it would set all the ports in
forwarding state. Add an extra check to not set ports in forwarding state if
the port is an MRP ring port. The reason of this change is that if the MRP
instance initially sets the port in blocked state by setting the bridge up it
would overwrite this setting.
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_netlink.c')
-rw-r--r-- | net/bridge/br_netlink.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 4084f1ef8641..1a5e681a626a 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -672,6 +672,11 @@ static int br_afspec(struct net_bridge *br, if (err) return err; break; + case IFLA_BRIDGE_MRP: + err = br_mrp_parse(br, p, attr, cmd, extack); + if (err) + return err; + break; } } |