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: Nikolay Aleksandrov <nikolay@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
88d4bd1804
commit
7d07a68c25
@@ -127,10 +127,28 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
|
|||||||
switch (skb->protocol) {
|
switch (skb->protocol) {
|
||||||
case htons(ETH_P_IP):
|
case htons(ETH_P_IP):
|
||||||
ip.dst.ip4 = ip_hdr(skb)->daddr;
|
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;
|
break;
|
||||||
#if IS_ENABLED(CONFIG_IPV6)
|
#if IS_ENABLED(CONFIG_IPV6)
|
||||||
case htons(ETH_P_IPV6):
|
case htons(ETH_P_IPV6):
|
||||||
ip.dst.ip6 = ipv6_hdr(skb)->daddr;
|
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;
|
break;
|
||||||
#endif
|
#endif
|
||||||
default:
|
default:
|
||||||
|
|||||||
Reference in New Issue
Block a user