svn commit: r237995 - stable/9/sys/netinet6

[Bruce M Simpson]

Author: bms
Date: Mon Jul  2 11:46:47 2012
New Revision: 237995
URL: http://svn.freebsd.org/changeset/base/237995

Log:
  Merge r237736 from HEAD:
    Kick the current-state report timer when a V1 group report would
    be triggered.
  
  Submitted by:	rpaulo@

Modified:
  stable/9/sys/netinet6/mld6.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/isp/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/netinet6/mld6.c
==============================================================================
--- stable/9/sys/netinet6/mld6.c	Mon Jul  2 10:16:14 2012	(r237994)
+++ stable/9/sys/netinet6/mld6.c	Mon Jul  2 11:46:47 2012	(r237995)
@@ -2196,6 +2196,7 @@ mld_final_leave(struct in6_multi *inm, s
 #endif
 			mld_v1_transmit_report(inm, MLD_LISTENER_DONE);
 			inm->in6m_state = MLD_NOT_MEMBER;
+			V_current_state_timers_running6 = 1;
 		} else if (mli->mli_version == MLD_VERSION_2) {
 			/*
 			 * Stop group timer and all pending reports.