Skip to contentSkip to conversation

bridge: fix switched interval for MLD Query types

PATCH Applied Linus Lüssing 2 participants 2 messages Jun 16, 2013 – Jun 18, 2013

Subsystems (3)
Networking Network drivers Ethernet bridge
lore
Share & tools
lore

Linus Lüssing

author
#0 lore raw

PATCH 1/1 bridge: fix switched interval for MLD Query types

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 <[email protected]>
---
 net/bridge/br_multicast.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
net/bridge/br_multicast.c +3 -2
index 81f2389..d6448e3 100644
@@ -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;
Signature · 1 line
1.7.10.4
maintainer Applied
#1 lore raw

From: Linus Lüssing <[email protected]>
Date: Sun, 16 Jun 2013 23:20:34 +0200

Quoted 7 lines

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 <[email protected]>

Applied, thanks.