[PATCH] bridge: fix switched interval for MLD Query types

[PATCH] bridge: fix switched interval for MLD Query types

[Linus Lüssing]

General Queries (the one with the Multicast Address field
set to zero / '::') are supposed to have a Maximum Response Delay
of [Query Response Interval], while for Multicast-Address-Specific
Queries it is [Last Listener Query Interval] - not the other way
round. (see RFC2710, section 7.3+7.8)

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
---
 net/bridge/br_multicast.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 81f2389..d6448e3 100644
--- a/net/bridge/br_multicast.c
+++ b/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;
-- 
1.7.10.4

Re: [PATCH] bridge: fix switched interval for MLD Query types

[David Miller]

From: Linus Lüssing <linus.luessing@web.de>
Date: Sun, 16 Jun 2013 23:20:34 +0200

> General Queries (the one with the Multicast Address field
> set to zero / '::') are supposed to have a Maximum Response Delay
> of [Query Response Interval], while for Multicast-Address-Specific
> Queries it is [Last Listener Query Interval] - not the other way
> round. (see RFC2710, section 7.3+7.8)
> 
> Signed-off-by: Linus Lüssing <linus.luessing@web.de>

Applied, thanks.