|
@@ -434,7 +434,6 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
|
|
|
eth = eth_hdr(skb);
|
|
|
|
|
|
memcpy(eth->h_source, br->dev->dev_addr, 6);
|
|
|
- ipv6_eth_mc_map(group, eth->h_dest);
|
|
|
eth->h_proto = htons(ETH_P_IPV6);
|
|
|
skb_put(skb, sizeof(*eth));
|
|
|
|
|
@@ -448,6 +447,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
|
|
|
ip6h->hop_limit = 1;
|
|
|
ipv6_addr_set(&ip6h->saddr, 0, 0, 0, 0);
|
|
|
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
|
|
|
+ ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
|
|
|
|
|
|
hopopt = (u8 *)(ip6h + 1);
|
|
|
hopopt[0] = IPPROTO_ICMPV6; /* next hdr */
|