---

yaml --- r: 377401 b: refs/heads/master c: 32de868 h: refs/heads/master i: 377399: 403f0da v: v3
git-mirror · Jun 18, 2013 · 1fd9cc4 · 1fd9cc4
1 parent 9135f01
commit 1fd9cc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 788dfcacacfbdd51f9c92065bd8e136686f07a29
+refs/heads/master: 32de868cbc6bee010d2cee95b5071b25ecbec8c3
diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c
@@ -465,8 +465,9 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
 	skb_set_transport_header(skb, skb->len);
 	mldq = (struct mld_msg *) icmp6_hdr(skb);
 
-	interval = ipv6_addr_any(group) ? br->multicast_last_member_interval :
-					  br->multicast_query_response_interval;
+	interval = ipv6_addr_any(group) ?
+			br->multicast_query_response_interval :
+			br->multicast_last_member_interval;
 
 	mldq->mld_type = ICMPV6_MGM_QUERY;
 	mldq->mld_code = 0;