diff options
| author | Linus Lüssing <linus.luessing@web.de> | 2013-06-16 23:20:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-18 02:11:22 +0200 |
| commit | 32de868cbc6bee010d2cee95b5071b25ecbec8c3 (patch) | |
| tree | 4732265c9470bf469793c090eaa844f972a3bceb /net/bridge/br_multicast.c | |
| parent | vlan: restore ethtool ABI to control VLAN hardware acceleration (diff) | |
| download | linux-32de868cbc6bee010d2cee95b5071b25ecbec8c3.tar.xz linux-32de868cbc6bee010d2cee95b5071b25ecbec8c3.zip | |
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 <linus.luessing@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_multicast.c')
| -rw-r--r-- | net/bridge/br_multicast.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 81f2389f78eb..d6448e35e027 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; |