Commit 7d07a68c authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: mcast: when igmpv3/mldv2 are enabled lookup (S,G) first, then (*,G) 



If (S,G) entries are enabled (igmpv3/mldv2) then look them up first. If
there isn't a present (S,G) entry then try to find (*,G).

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 88d4bd18

net/bridge/br_multicast.c

+18 −0
Original line number Diff line number Diff line
@@ -127,10 +127,28 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br, 
	switch (skb->protocol) {

	case htons(ETH_P_IP):

		ip.dst.ip4 = ip_hdr(skb)->daddr;

		if (br->multicast_igmp_version == 3) {

			struct net_bridge_mdb_entry *mdb;



			ip.src.ip4 = ip_hdr(skb)->saddr;

			mdb = br_mdb_ip_get_rcu(br, &ip);

			if (mdb)

				return mdb;

			ip.src.ip4 = 0;

		}

		break;

#if IS_ENABLED(CONFIG_IPV6)

	case htons(ETH_P_IPV6):

		ip.dst.ip6 = ipv6_hdr(skb)->daddr;

		if (br->multicast_mld_version == 2) {

			struct net_bridge_mdb_entry *mdb;



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

			mdb = br_mdb_ip_get_rcu(br, &ip);

			if (mdb)

				return mdb;

			memset(&ip.src.ip6, 0, sizeof(ip.src.ip6));

		}

		break;

#endif

	default: