From owner-svn-src-head@FreeBSD.ORG  Fri Jun  7 17:12:09 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 64BD51D9;
 Fri,  7 Jun 2013 17:12:09 +0000 (UTC) (envelope-from bms@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 572B91B17;
 Fri,  7 Jun 2013 17:12:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r57HC9Rr087519;
 Fri, 7 Jun 2013 17:12:09 GMT (envelope-from bms@svn.freebsd.org)
Received: (from bms@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r57HC97k087518;
 Fri, 7 Jun 2013 17:12:09 GMT (envelope-from bms@svn.freebsd.org)
Message-Id: <201306071712.r57HC97k087518@svn.freebsd.org>
From: Bruce M Simpson <bms@FreeBSD.org>
Date: Fri, 7 Jun 2013 17:12:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251502 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jun 2013 17:12:09 -0000

Author: bms
Date: Fri Jun  7 17:12:08 2013
New Revision: 251502
URL: http://svnweb.freebsd.org/changeset/base/251502

Log:
  Disable IGMPv3 link timers on a transition to IGMPv2.
  
  Submitted by:	Alan Smithee

Modified:
  head/sys/netinet/igmp.c

Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c	Fri Jun  7 17:06:08 2013	(r251501)
+++ head/sys/netinet/igmp.c	Fri Jun  7 17:12:08 2013	(r251502)
@@ -2121,6 +2121,7 @@ igmp_v1v2_process_querier_timers(struct 
 				    __func__, igi->igi_version, IGMP_VERSION_2,
 				    igi->igi_ifp, igi->igi_ifp->if_xname);
 				igi->igi_version = IGMP_VERSION_2;
+				igmp_v3_cancel_link_timers(igi);
 			}
 		}
 	} else if (igi->igi_v1_timer > 0) {