From owner-svn-src-head@FreeBSD.ORG  Thu May 21 04:00:31 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 777C91065672;
	Thu, 21 May 2009 04:00:31 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 65EE28FC0C;
	Thu, 21 May 2009 04:00:31 +0000 (UTC) (envelope-from sam@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 n4L40Ves053926;
	Thu, 21 May 2009 04:00:31 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4L40VoI053925;
	Thu, 21 May 2009 04:00:31 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200905210400.n4L40VoI053925@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Thu, 21 May 2009 04:00:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192517 - head/sys/dev/wi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 21 May 2009 04:00:31 -0000

Author: sam
Date: Thu May 21 04:00:31 2009
New Revision: 192517
URL: http://svn.freebsd.org/changeset/base/192517

Log:
  force type match

Modified:
  head/sys/dev/wi/if_wi.c

Modified: head/sys/dev/wi/if_wi.c
==============================================================================
--- head/sys/dev/wi/if_wi.c	Thu May 21 03:35:02 2009	(r192516)
+++ head/sys/dev/wi/if_wi.c	Thu May 21 04:00:31 2009	(r192517)
@@ -1382,7 +1382,7 @@ wi_rx_intr(struct wi_softc *sc)
 
 		rstamp = (le16toh(frmhdr.wi_rx_tstamp0) << 16) |
 		    le16toh(frmhdr.wi_rx_tstamp1);
-		tap->wr_tsf = htole64(rstamp);
+		tap->wr_tsf = htole64((uint64_t)rstamp);
 		/* XXX replace divide by table */
 		tap->wr_rate = frmhdr.wi_rx_rate / 5;
 		tap->wr_flags = 0;