From owner-p4-projects@FreeBSD.ORG  Mon Mar  5 22:08:54 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1C7FA16A408; Mon,  5 Mar 2007 22:08:54 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D15A416A406
	for <perforce@freebsd.org>; Mon,  5 Mar 2007 22:08:53 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id C240613C491
	for <perforce@freebsd.org>; Mon,  5 Mar 2007 22:08:53 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l25M8rVq062007
	for <perforce@freebsd.org>; Mon, 5 Mar 2007 22:08:53 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l25M8rj7062004
	for perforce@freebsd.org; Mon, 5 Mar 2007 22:08:53 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 5 Mar 2007 22:08:53 GMT
Message-Id: <200703052208.l25M8rj7062004@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 115372 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Mar 2007 22:08:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=115372

Change 115372 by sam@sam_ebb on 2007/03/05 22:08:12

	IFC

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#68 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_var.h#49 integrate

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#68 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.51 2006/11/06 13:42:03 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.52 2007/03/05 19:12:25 sam Exp $");
 
 #include "opt_compat.h"
 
@@ -485,7 +485,7 @@
 	struct scanreq req;
 	int error;
 
-	if (ireq->i_len < sizeof(struct scanreq))
+	if (ireq->i_len < sizeof(struct ieee80211req_scan_result))
 		return EFAULT;
 
 	error = 0;

==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#49 (text+ko) ====

@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.45 2007/01/06 02:56:41 kmacy Exp $
+ * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.46 2007/03/05 18:52:35 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_VAR_H_
 #define _NET80211_IEEE80211_VAR_H_
@@ -87,9 +87,9 @@
 #define	IEEE80211_RTS_DEFAULT		IEEE80211_RTS_MAX
 #define	IEEE80211_FRAG_DEFAULT		IEEE80211_FRAG_MAX
 
-#define	IEEE80211_MS_TO_TU(x)	(((x) * 1024) / 1000)
-#define	IEEE80211_TU_TO_MS(x)	(((x) * 1000) / 1024)
-#define	IEEE80211_TU_TO_TICKS(x)(((x) * hz) / 1024)
+#define	IEEE80211_MS_TO_TU(x)	(((x) * 1000) / 1024)
+#define	IEEE80211_TU_TO_MS(x)	(((x) * 1024) / 1000)
+#define	IEEE80211_TU_TO_TICKS(x)(((x) * 1024 * hz) / (1000 * 1000))
 
 struct ieee80211_aclator;
 struct sysctl_ctx_list;