aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_multicast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 1207a5a0688a..c1f24e4d0820 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -434,7 +434,6 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
434 eth = eth_hdr(skb); 434 eth = eth_hdr(skb);
435 435
436 memcpy(eth->h_source, br->dev->dev_addr, 6); 436 memcpy(eth->h_source, br->dev->dev_addr, 6);
437 ipv6_eth_mc_map(group, eth->h_dest);
438 eth->h_proto = htons(ETH_P_IPV6); 437 eth->h_proto = htons(ETH_P_IPV6);
439 skb_put(skb, sizeof(*eth)); 438 skb_put(skb, sizeof(*eth));
440 439
@@ -448,6 +447,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
448 ip6h->hop_limit = 1; 447 ip6h->hop_limit = 1;
449 ipv6_addr_set(&ip6h->saddr, 0, 0, 0, 0); 448 ipv6_addr_set(&ip6h->saddr, 0, 0, 0, 0);
450 ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); 449 ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
450 ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
451 451
452 hopopt = (u8 *)(ip6h + 1); 452 hopopt = (u8 *)(ip6h + 1);
453 hopopt[0] = IPPROTO_ICMPV6; /* next hdr */ 453 hopopt[0] = IPPROTO_ICMPV6; /* next hdr */