From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Subject: [PATCH] bridge: fix switched interval for MLD Query types Date: Sun, 16 Jun 2013 23:20:34 +0200 Message-ID: <1371417634-29803-1-git-send-email-linus.luessing@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Stephen Hemminger , netdev@vger.kernel.org, =?UTF-8?q?Linus=20L=C3=BCssing?= , "David S. Miller" , linux-kernel@vger.kernel.org To: bridge@lists.linux-foundation.org Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: bridge-bounces@lists.linux-foundation.org Errors-To: bridge-bounces@lists.linux-foundation.org List-Id: netdev.vger.kernel.org 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=C3=BCssing --- 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(s= truct net_bridge *br, skb_set_transport_header(skb, skb->len); mldq =3D (struct mld_msg *) icmp6_hdr(skb); =20 - interval =3D ipv6_addr_any(group) ? br->multicast_last_member_interval = : - br->multicast_query_response_interval; + interval =3D ipv6_addr_any(group) ? + br->multicast_query_response_interval : + br->multicast_last_member_interval; =20 mldq->mld_type =3D ICMPV6_MGM_QUERY; mldq->mld_code =3D 0; --=20 1.7.10.4