path: root/net
diff options
authorLinus Lüssing <>2011-02-15 13:19:17 +0000
committerDavid S. Miller <>2011-02-22 10:07:26 -0800
commit9cc6e0c4c457f84bedcfb04e7dd58a36909c4ef7 (patch)
treee0a1dc5eba3ce25e8f1cf0b3b78a60314ee80975 /net
parentc24f691b56107feeba076616982093ee2d3c8fb5 (diff)
bridge: Fix IPv6 multicast snooping by storing correct protocol type
The protocol type for IPv6 entries in the hash table for multicast bridge snooping is falsely set to ETH_P_IP, marking it as an IPv4 address, instead of setting it to ETH_P_IPV6, which results in negative look-ups in the hash table later. Signed-off-by: Linus Lüssing <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'net')
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 09d5c0987925..17708fccf1ee 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -784,7 +784,7 @@ static int br_ip6_multicast_add_group(struct net_bridge *br,
return 0;
ipv6_addr_copy(&br_group.u.ip6, group);
- br_group.proto = htons(ETH_P_IP);
+ br_group.proto = htons(ETH_P_IPV6);
return br_multicast_add_group(br, port, &br_group);