Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: Guenter Roeck <groeck7@gmail.com>
Date:   Sat, 15 May 2021 09:44:57 -0700
From:   Guenter Roeck <linux@roeck-us.net>
To:     Linus =?iso-8859-1?Q?L=FCssing?= <linus.luessing@c0d3.blue>
Cc:     netdev@vger.kernel.org, Roopa Prabhu <roopa@nvidia.com>,
        Nikolay Aleksandrov <nikolay@nvidia.com>,
        Jakub Kicinski <kuba@kernel.org>,
        "David S . Miller" <davem@davemloft.net>,
        bridge@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Subject: Re: [net-next v4 05/11] net: bridge: mcast: prepare is-router
 function for mcast router split
Message-ID: <20210515164457.GA1387203@roeck-us.net>
References: <20210513132053.23445-1-linus.luessing@c0d3.blue>
 <20210513132053.23445-6-linus.luessing@c0d3.blue>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20210513132053.23445-6-linus.luessing@c0d3.blue>
Precedence: bulk

On Thu, May 13, 2021 at 03:20:47PM +0200, Linus L?ssing wrote:
> In preparation for the upcoming split of multicast router state into
> their IPv4 and IPv6 variants make br_multicast_is_router() protocol
> family aware.
> 
> Note that for now br_ip6_multicast_is_router() uses the currently still
> common ip4_mc_router_timer for now. It will be renamed to
> ip6_mc_router_timer later when the split is performed.
> 
> While at it also renames the "1" and "2" constants in
> br_multicast_is_router() to the MDB_RTR_TYPE_TEMP_QUERY and
> MDB_RTR_TYPE_PERM enums.
> 
> Signed-off-by: Linus L?ssing <linus.luessing@c0d3.blue>

Just in case this hasn't been reported yet. In next-20210514:

$ git grep br_multicast_is_router
net/bridge/br_input.c:                      br_multicast_is_router(br, skb)) {
net/bridge/br_multicast.c:      is_router = br_multicast_is_router(br, NULL);
net/bridge/br_private.h:br_multicast_is_router(struct net_bridge *br, struct sk_buff *skb)
                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
net/bridge/br_private.h:static inline bool br_multicast_is_router(struct net_bridge *br)
                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Guenter