[net-next v3 9/9] bridge: cfm: Bridge port remove.
flat view
STALE2215d
SUPERSEDED: 1 (1M)
From: Henrik Bjoernlund <hidden>
Date: 2020-10-06 14:56:16
Also in:
bridge, lkml
Subsystem:
ethernet bridge, networking [general], the rest · Maintainers:
Nikolay Aleksandrov, Ido Schimmel, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Status: Superseded by v7 (posted 2020-10-27). [go to v7]
Revision v3 (6 revisions archived); 1 review trailer.
Revisions (6)
This is addition of CFM functionality to delete MEP instances on a port that is removed from the bridge. A MEP can only exist on a port that is related to a bridge. Signed-off-by: Henrik Bjoernlund <redacted>m Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com> --- net/bridge/br_cfm.c | 13 +++++++++++++ net/bridge/br_if.c | 1 + net/bridge/br_private.h | 6 ++++++ 3 files changed, 20 insertions(+)
diff --git a/net/bridge/br_cfm.c b/net/bridge/br_cfm.c
index 6fbfef44c235..fc8268cb76c1 100644
--- a/net/bridge/br_cfm.c
+++ b/net/bridge/br_cfm.c@@ -867,3 +867,16 @@ bool br_cfm_created(struct net_bridge *br) { return !hlist_empty(&br->mep_list); } + +/* Deletes the CFM instances on a specific bridge port + */ +void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *port) +{ + struct br_cfm_mep *mep; + + ASSERT_RTNL(); + + hlist_for_each_entry(mep, &br->mep_list, head) + if (mep->create.ifindex == port->dev->ifindex) + mep_delete_implementation(br, mep); +}
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index a0e9a7937412..f7d2f472ae24 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c@@ -334,6 +334,7 @@ static void del_nbp(struct net_bridge_port *p) spin_unlock_bh(&br->lock); br_mrp_port_del(br, p); + br_cfm_port_del(br, p); br_ifinfo_notify(RTM_DELLINK, NULL, p);
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index c36a0e3e29f2..6c79b10dad82 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h@@ -1465,6 +1465,7 @@ static inline int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br) int br_cfm_parse(struct net_bridge *br, struct net_bridge_port *p, struct nlattr *attr, int cmd, struct netlink_ext_ack *extack); bool br_cfm_created(struct net_bridge *br); +void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *p); int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br); int br_cfm_status_fill_info(struct sk_buff *skb, struct net_bridge *br,
@@ -1484,6 +1485,11 @@ static inline bool br_cfm_created(struct net_bridge *br) return false; } +static inline void br_cfm_port_del(struct net_bridge *br, + struct net_bridge_port *p) +{ +} + static inline int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br) { return -EOPNOTSUPP;
--
2.28.0