net: bridge: multicast: add context support for host-joined groups

Adding bridge multicast context support for host-joined groups is easy
because we only need the proper timer value. We pass the already chosen
context and use its timer value.

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 7b6c3b91d2723543cb32ddb30cd48701962aa106..25d690b96cec1c19fee451d9b160f138e9f546a6 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -1105,7 +1105,7 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
                        return -EEXIST;
                }
 
-               br_multicast_host_join(mp, false);
+               br_multicast_host_join(brmctx, mp, false);
                br_mdb_notify(br->dev, mp, NULL, RTM_NEWMDB);
 
                return 0;

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 214d1bf854ad71fb36f7c798174fbae7c32ce789..470f1ec3b579aaa846e9581f447d122302e325c6 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1312,7 +1312,8 @@ struct net_bridge_port_group *br_multicast_new_port_group(
        return p;
 }
 
-void br_multicast_host_join(struct net_bridge_mdb_entry *mp, bool notify)
+void br_multicast_host_join(const struct net_bridge_mcast *brmctx,
+                           struct net_bridge_mdb_entry *mp, bool notify)
 {
        if (!mp->host_joined) {
                mp->host_joined = true;
@@ -1325,8 +1326,7 @@ void br_multicast_host_join(struct net_bridge_mdb_entry *mp, bool notify)
        if (br_group_is_l2(&mp->addr))
                return;
 
-       mod_timer(&mp->timer,
-                 jiffies + mp->br->multicast_ctx.multicast_membership_interval);
+       mod_timer(&mp->timer, jiffies + brmctx->multicast_membership_interval);
 }
 
 void br_multicast_host_leave(struct net_bridge_mdb_entry *mp, bool notify)
@@ -1363,7 +1363,7 @@ __br_multicast_add_group(struct net_bridge_mcast *brmctx,
                return ERR_CAST(mp);
 
        if (!pmctx) {
-               br_multicast_host_join(mp, true);
+               br_multicast_host_join(brmctx, mp, true);
                goto out;
        }
 

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 4681a4b6020ffcaa0422fe9cfb33107e12dcd365..30be9d07606fff3568aefb08074a116876ae7cff 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -887,7 +887,8 @@ void br_multicast_get_stats(const struct net_bridge *br,
                            struct br_mcast_stats *dest);
 void br_mdb_init(void);
 void br_mdb_uninit(void);
-void br_multicast_host_join(struct net_bridge_mdb_entry *mp, bool notify);
+void br_multicast_host_join(const struct net_bridge_mcast *brmctx,
+                           struct net_bridge_mdb_entry *mp, bool notify);
 void br_multicast_host_leave(struct net_bridge_mdb_entry *mp, bool notify);
 void br_multicast_star_g_handle_mode(struct net_bridge_port_group *pg,
                                     u8 filter_mode);