From owner-svn-src-stable-7@FreeBSD.ORG  Thu Oct 30 16:09:08 2008
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45E96106567B;
	Thu, 30 Oct 2008 16:09:08 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 33E658FC08;
	Thu, 30 Oct 2008 16:09:08 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9UG989o055679;
	Thu, 30 Oct 2008 16:09:08 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9UG98k6055678;
	Thu, 30 Oct 2008 16:09:08 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200810301609.m9UG98k6055678@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Thu, 30 Oct 2008 16:09:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184476 - in stable/7/sys: . netinet6
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Oct 2008 16:09:08 -0000

Author: bz
Date: Thu Oct 30 16:09:08 2008
New Revision: 184476
URL: http://svn.freebsd.org/changeset/base/184476

Log:
  MFC: r182915
  
    mld_timerresid() returns ms so instead of doing the maths in usec
    and then dividing down to ms, do the maths in ms.
  
  Obtained from:	NetBSD mld6.c rev. 1.47
  Approved by:	re (gnn)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/netinet6/mld6.c

Modified: stable/7/sys/netinet6/mld6.c
==============================================================================
--- stable/7/sys/netinet6/mld6.c	Thu Oct 30 15:56:04 2008	(r184475)
+++ stable/7/sys/netinet6/mld6.c	Thu Oct 30 16:09:08 2008	(r184476)
@@ -203,7 +203,7 @@ mld_timerresid(struct in6_multi *in6m)
 	}
 
 	/* return the remaining time in milliseconds */
-	return (((u_long)(diff.tv_sec * 1000000 + diff.tv_usec)) / 1000);
+	return (diff.tv_sec * 1000 + diff.tv_usec / 1000);
 }
 
 void