From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752397Ab2HBHv1 (ORCPT ); Thu, 2 Aug 2012 03:51:27 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:37521 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750737Ab2HBHvZ (ORCPT ); Thu, 2 Aug 2012 03:51:25 -0400 From: Dragos Ilie To: "David S. Miller" Cc: Dragos Ilie , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ipv6: Fix premature timeout for MLDv1 compatibility mode Date: Thu, 2 Aug 2012 09:51:06 +0200 Message-Id: <1343893866-20940-1-git-send-email-dragos.ilie@gmail.com> X-Mailer: git-send-email 1.7.8.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The timeout for MLDv1 compatibility mode is now calculated according to Section 9.2 in RFC 3810. Signed-off-by: Dragos Ilie --- net/ipv6/mcast.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 92f8e48..ef824a0 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -109,6 +109,7 @@ static int ip6_mc_leave_src(struct sock *sk, struct ipv6_mc_socklist *iml, #define IGMP6_UNSOLICITED_IVAL (10*HZ) #define MLD_QRV_DEFAULT 2 +#define MLD_QIVAL_DEFAULT (125*HZ) #define MLD_V1_SEEN(idev) (dev_net((idev)->dev)->ipv6.devconf_all->force_mld_version == 1 || \ (idev)->cnf.force_mld_version == 1 || \ @@ -1152,7 +1153,7 @@ int igmp6_event_query(struct sk_buff *skb) /* Translate milliseconds to jiffies */ max_delay = (ntohs(mld->mld_maxdelay)*HZ)/1000; - switchback = (idev->mc_qrv + 1) * max_delay; + switchback = (idev->mc_qrv * MLD_QIVAL_DEFAULT) + max_delay; idev->mc_v1_seen = jiffies + switchback; /* cancel the interface change timer */ -- 1.7.8.6