Commit b19232ef authored by Linus Lüssing's avatar Linus Lüssing Committed by David S. Miller
Browse files

net: bridge: mcast: prepare query reception for mcast router split 



In preparation for the upcoming split of multicast router state into
their IPv4 and IPv6 variants and as the br_multicast_mark_router() will
be split for that remove the select querier wrapper and instead add
ip4 and ip6 variants for br_multicast_query_received().

Signed-off-by: default avatarLinus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff391c5d

net/bridge/br_multicast.c

+27 −26
Original line number Diff line number Diff line
@@ -2615,22 +2615,6 @@ static bool br_ip6_multicast_select_querier(struct net_bridge *br, 
}

#endif



static bool br_multicast_select_querier(struct net_bridge *br,

					struct net_bridge_port *port,

					struct br_ip *saddr)

{

	switch (saddr->proto) {

	case htons(ETH_P_IP):

		return br_ip4_multicast_select_querier(br, port, saddr->src.ip4);

#if IS_ENABLED(CONFIG_IPV6)

	case htons(ETH_P_IPV6):

		return br_ip6_multicast_select_querier(br, port, &saddr->src.ip6);

#endif

	}



	return false;

}



static void

br_multicast_update_query_timer(struct net_bridge *br,

				struct bridge_mcast_other_query *query,
@@ -2708,18 +2692,35 @@ static void br_multicast_mark_router(struct net_bridge *br, 
		  now + br->multicast_querier_interval);

}



static void br_multicast_query_received(struct net_bridge *br,

static void

br_ip4_multicast_query_received(struct net_bridge *br,

				struct net_bridge_port *port,

				struct bridge_mcast_other_query *query,

				struct br_ip *saddr,

				unsigned long max_delay)

{

	if (!br_ip4_multicast_select_querier(br, port, saddr->src.ip4))

		return;



	br_multicast_update_query_timer(br, query, max_delay);

	br_multicast_mark_router(br, port);

}



#if IS_ENABLED(CONFIG_IPV6)

static void

br_ip6_multicast_query_received(struct net_bridge *br,

				struct net_bridge_port *port,

				struct bridge_mcast_other_query *query,

				struct br_ip *saddr,

				unsigned long max_delay)

{

	if (!br_multicast_select_querier(br, port, saddr))

	if (!br_ip6_multicast_select_querier(br, port, &saddr->src.ip6))

		return;



	br_multicast_update_query_timer(br, query, max_delay);

	br_multicast_mark_router(br, port);

}

#endif



static void br_ip4_multicast_query(struct net_bridge *br,

				   struct net_bridge_port *port,
@@ -2768,7 +2769,7 @@ static void br_ip4_multicast_query(struct net_bridge *br, 
		saddr.proto = htons(ETH_P_IP);

		saddr.src.ip4 = iph->saddr;



		br_multicast_query_received(br, port, &br->ip4_other_query,

		br_ip4_multicast_query_received(br, port, &br->ip4_other_query,

						&saddr, max_delay);

		goto out;

	}
@@ -2856,7 +2857,7 @@ static int br_ip6_multicast_query(struct net_bridge *br, 
		saddr.proto = htons(ETH_P_IPV6);

		saddr.src.ip6 = ipv6_hdr(skb)->saddr;



		br_multicast_query_received(br, port, &br->ip6_other_query,

		br_ip6_multicast_query_received(br, port, &br->ip6_other_query,

						&saddr, max_delay);

		goto out;

	} else if (!group) {