Commit 083e3534 authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski

bridge: mcast: Expose __br_multicast_del_group_src()

Expose __br_multicast_del_group_src() which is symmetric to
br_multicast_new_group_src() and does not remove the installed {S, G}
forwarding entry, unlike br_multicast_del_group_src().

The function will be used in the error path when user space was able to
add a new source entry, but failed to install a corresponding forwarding
entry.
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fd0c6961
...@@ -650,18 +650,23 @@ static void br_multicast_destroy_group_src(struct net_bridge_mcast_gc *gc) ...@@ -650,18 +650,23 @@ static void br_multicast_destroy_group_src(struct net_bridge_mcast_gc *gc)
kfree_rcu(src, rcu); kfree_rcu(src, rcu);
} }
void br_multicast_del_group_src(struct net_bridge_group_src *src, void __br_multicast_del_group_src(struct net_bridge_group_src *src)
bool fastleave)
{ {
struct net_bridge *br = src->pg->key.port->br; struct net_bridge *br = src->pg->key.port->br;
br_multicast_fwd_src_remove(src, fastleave);
hlist_del_init_rcu(&src->node); hlist_del_init_rcu(&src->node);
src->pg->src_ents--; src->pg->src_ents--;
hlist_add_head(&src->mcast_gc.gc_node, &br->mcast_gc_list); hlist_add_head(&src->mcast_gc.gc_node, &br->mcast_gc_list);
queue_work(system_long_wq, &br->mcast_gc_work); queue_work(system_long_wq, &br->mcast_gc_work);
} }
void br_multicast_del_group_src(struct net_bridge_group_src *src,
bool fastleave)
{
br_multicast_fwd_src_remove(src, fastleave);
__br_multicast_del_group_src(src);
}
static void br_multicast_destroy_port_group(struct net_bridge_mcast_gc *gc) static void br_multicast_destroy_port_group(struct net_bridge_mcast_gc *gc)
{ {
struct net_bridge_port_group *pg; struct net_bridge_port_group *pg;
......
...@@ -977,6 +977,7 @@ br_multicast_find_group_src(struct net_bridge_port_group *pg, struct br_ip *ip); ...@@ -977,6 +977,7 @@ br_multicast_find_group_src(struct net_bridge_port_group *pg, struct br_ip *ip);
struct net_bridge_group_src * struct net_bridge_group_src *
br_multicast_new_group_src(struct net_bridge_port_group *pg, br_multicast_new_group_src(struct net_bridge_port_group *pg,
struct br_ip *src_ip); struct br_ip *src_ip);
void __br_multicast_del_group_src(struct net_bridge_group_src *src);
void br_multicast_del_group_src(struct net_bridge_group_src *src, void br_multicast_del_group_src(struct net_bridge_group_src *src,
bool fastleave); bool fastleave);
void br_multicast_ctx_init(struct net_bridge *br, void br_multicast_ctx_init(struct net_bridge *br,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment