@ -87,19 +87,16 @@
{
struct br_ip br_group;
@@ -736,7 +758, 10 @@ static int br_ip6_multicast_add_group(st
@@ -736,7 +758, 7 @@ static int br_ip6_multicast_add_group(st
br_group.proto = htons(ETH_P_IPV6);
br_group.vid = vid;
- return br_multicast_add_group(br, port, &br_group);
+ if (ipv6_addr_is_solict_mult(group))
+ src = NULL;
+
+ return br_multicast_add_group(br, port, &br_group, src);
}
#endif
@@ -965,6 +9 90 ,7 @@ static int br_ip4_multicast_igmp3_report
@@ -965,6 +9 87 ,7 @@ static int br_ip4_multicast_igmp3_report
struct sk_buff *skb,
u16 vid)
{
@ -107,7 +104,7 @@
struct igmpv3_report *ih;
struct igmpv3_grec *grec;
int i;
@@ -1008,7 +103 4 ,7 @@ static int br_ip4_multicast_igmp3_report
@@ -1008,7 +103 1 ,7 @@ static int br_ip4_multicast_igmp3_report
continue;
}
@ -116,7 +113,7 @@
if (err)
break;
}
@@ -1022,6 +104 8 ,7 @@ static int br_ip6_multicast_mld2_report(
@@ -1022,6 +104 5 ,7 @@ static int br_ip6_multicast_mld2_report(
struct sk_buff *skb,
u16 vid)
{
@ -124,7 +121,7 @@
struct icmp6hdr *icmp6h;
struct mld2_grec *grec;
int i;
@@ -1070,7 +109 7 ,7 @@ static int br_ip6_multicast_mld2_report(
@@ -1070,7 +109 4 ,7 @@ static int br_ip6_multicast_mld2_report(
}
err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
@ -133,7 +130,7 @@
if (err)
break;
}
@@ -140 6,7 +1433 ,8 @@ br_multicast_leave_group(struct net_brid
@@ -140 7,7 +1431 ,8 @@ br_multicast_leave_group(struct net_brid
struct net_bridge_port *port,
struct br_ip *group,
struct bridge_mcast_other_query *other_query,
@ -143,7 +140,7 @@
{
struct net_bridge_mdb_htable *mdb;
struct net_bridge_mdb_entry *mp;
@@ -145 6,7 +1484 ,7 @@ br_multicast_leave_group(struct net_brid
@@ -145 7,7 +1482 ,7 @@ br_multicast_leave_group(struct net_brid
for (pp = &mp->ports;
(p = mlock_dereference(*pp, br)) != NULL;
pp = &p->next) {
@ -152,7 +149,7 @@
continue;
rcu_assign_pointer(*pp, p->next);
@@ -149 0,7 +1518 ,7 @@ br_multicast_leave_group(struct net_brid
@@ -149 1,7 +1516 ,7 @@ br_multicast_leave_group(struct net_brid
for (p = mlock_dereference(mp->ports, br);
p != NULL;
p = mlock_dereference(p->next, br)) {
@ -161,7 +158,7 @@
continue;
if (!hlist_unhashed(&p->mglist) &&
@@ -150 8,8 +1536 ,8 @@ out:
@@ -150 9,8 +1534 ,8 @@ out:
static void br_ip4_multicast_leave_group(struct net_bridge *br,
struct net_bridge_port *port,
@ -172,7 +169,7 @@
{
struct br_ip br_group;
struct bridge_mcast_own_query *own_query;
@@ -152 4,14 +1552 ,14 @@ static void br_ip4_multicast_leave_group
@@ -152 5,14 +1550 ,14 @@ static void br_ip4_multicast_leave_group
br_group.vid = vid;
br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
@ -189,7 +186,7 @@
{
struct br_ip br_group;
struct bridge_mcast_own_query *own_query;
@@ -154 6,7 +1574 ,7 @@ static void br_ip6_multicast_leave_group
@@ -154 7,7 +1572 ,7 @@ static void br_ip6_multicast_leave_group
br_group.vid = vid;
br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
@ -198,7 +195,7 @@
}
#endif
@@ -155 5,6 +1583 ,7 @@ static int br_multicast_ipv4_rcv(struct
@@ -155 6,6 +1581 ,7 @@ static int br_multicast_ipv4_rcv(struct
struct sk_buff *skb,
u16 vid)
{
@ -206,7 +203,7 @@
struct sk_buff *skb2 = skb;
const struct iphdr *iph;
struct igmphdr *ih;
@@ -162 8,7 +1657 ,7 @@ static int br_multicast_ipv4_rcv(struct
@@ -162 9,7 +1655 ,7 @@ static int br_multicast_ipv4_rcv(struct
case IGMP_HOST_MEMBERSHIP_REPORT:
case IGMPV2_HOST_MEMBERSHIP_REPORT:
BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
@ -215,7 +212,7 @@
break;
case IGMPV3_HOST_MEMBERSHIP_REPORT:
err = br_ip4_multicast_igmp3_report(br, port, skb2, vid);
@@ -163 7,7 +1666 ,7 @@ static int br_multicast_ipv4_rcv(struct
@@ -163 8,7 +1664 ,7 @@ static int br_multicast_ipv4_rcv(struct
err = br_ip4_multicast_query(br, port, skb2, vid);
break;
case IGMP_HOST_LEAVE_MESSAGE:
@ -224,7 +221,7 @@
break;
}
@@ -165 5,6 +1684 ,7 @@ static int br_multicast_ipv6_rcv(struct
@@ -165 6,6 +1682 ,7 @@ static int br_multicast_ipv6_rcv(struct
struct sk_buff *skb,
u16 vid)
{
@ -232,7 +229,7 @@
struct sk_buff *skb2;
const struct ipv6hdr *ip6h;
u8 icmp6_type;
@@ -176 4,7 +1794 ,8 @@ static int br_multicast_ipv6_rcv(struct
@@ -176 5,7 +1792 ,8 @@ static int br_multicast_ipv6_rcv(struct
}
mld = (struct mld_msg *)skb_transport_header(skb2);
BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
@ -242,7 +239,7 @@
break;
}
case ICMPV6_MLD2_REPORT:
@@ -178 1,7 +1812 ,7 @@ static int br_multicast_ipv6_rcv(struct
@@ -178 2,7 +1810 ,7 @@ static int br_multicast_ipv6_rcv(struct
goto out;
}
mld = (struct mld_msg *)skb_transport_header(skb2);