---

yaml --- r: 253858 b: refs/heads/master c: fc2af6c h: refs/heads/master v: v3
git-mirror · Jun 17, 2011 · 549b2d5 · 549b2d5
1 parent 93953a2
commit 549b2d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62b2bcb49cca72f6d3f39f831127a6ab315a475d
+refs/heads/master: fc2af6c73fc9449cd5894a36bb76b8f8c0e49fd8
diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c
@@ -1543,7 +1543,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
 			goto out;
 		}
 		mld = (struct mld_msg *)skb_transport_header(skb2);
-		BR_INPUT_SKB_CB(skb2)->mrouters_only = 1;
+		BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
 		err = br_ip6_multicast_add_group(br, port, &mld->mld_mca);
 		break;
 	    }