net: bridge: mcast: br_multicast_set_port_router takes multicast context as argument

Change br_multicast_set_port_router to take port multicast context as
its first argument so we can later use it to control port/vlan mcast
router option.

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

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 16e686f5b9e9b7f868d2d61c848edc73e37d9c83..be9d1376e249f5465e882975668131c581713ec0 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -4246,15 +4246,16 @@ br_multicast_rport_del_notify(struct net_bridge_mcast_port *pmctx, bool deleted)
                pmctx->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
 }
 
-int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
+int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,
+                                unsigned long val)
 {
-       struct net_bridge_mcast *brmctx = &p->br->multicast_ctx;
-       struct net_bridge_mcast_port *pmctx = &p->multicast_ctx;
+       struct net_bridge_mcast *brmctx;
        unsigned long now = jiffies;
        int err = -EINVAL;
        bool del = false;
 
-       spin_lock(&p->br->multicast_lock);
+       brmctx = br_multicast_port_ctx_get_global(pmctx);
+       spin_lock(&brmctx->br->multicast_lock);
        if (pmctx->multicast_router == val) {
                /* Refresh the temp router port timer */
                if (pmctx->multicast_router == MDB_RTR_TYPE_TEMP) {
@@ -4304,7 +4305,7 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
        }
        err = 0;
 unlock:
-       spin_unlock(&p->br->multicast_lock);
+       spin_unlock(&brmctx->br->multicast_lock);
 
        return err;
 }

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 2f184ad8ae29c79ebfdd4da8b2d86e7701f1e8fa..6c58fc14d2cb2de8bcd8364fc5e766247aba2e97 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -932,7 +932,8 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[],
        if (tb[IFLA_BRPORT_MULTICAST_ROUTER]) {
                u8 mcast_router = nla_get_u8(tb[IFLA_BRPORT_MULTICAST_ROUTER]);
 
-               err = br_multicast_set_port_router(p, mcast_router);
+               err = br_multicast_set_port_router(&p->multicast_ctx,
+                                                  mcast_router);
                if (err)
                        return err;
        }

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 21b292eb2b3ed338c54f861fd94ac71097502fd8..fcc0fcf44a95138e930296f67f1cbafaa292b367 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -879,7 +879,8 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct sk_buff *skb,
                        struct net_bridge_mcast *brmctx,
                        bool local_rcv, bool local_orig);
 int br_multicast_set_router(struct net_bridge_mcast *brmctx, unsigned long val);
-int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val);
+int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,
+                                unsigned long val);
 int br_multicast_toggle(struct net_bridge *br, unsigned long val,
                        struct netlink_ext_ack *extack);
 int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val);

diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index e9e3aedd3178a9355acd8be0bebccd06fd83514e..07fa760805125a73ca45b0a96f1fc38266b70660 100644 (file)
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -250,7 +250,7 @@ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
 static int store_multicast_router(struct net_bridge_port *p,
                                      unsigned long v)
 {
-       return br_multicast_set_port_router(p, v);
+       return br_multicast_set_port_router(&p->multicast_ctx, v);
 }
 static BRPORT_ATTR(multicast_router, 0644, show_multicast_router,
                   store_multicast_router);