From owner-p4-projects@FreeBSD.ORG  Fri Jul 15 16:31:00 2005
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 F074816A420; Fri, 15 Jul 2005 16:30:59 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CC17616A41C
	for <perforce@freebsd.org>; Fri, 15 Jul 2005 16:30:59 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9E3EB43D49
	for <perforce@freebsd.org>; Fri, 15 Jul 2005 16:30:59 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FGUxYp007298
	for <perforce@freebsd.org>; Fri, 15 Jul 2005 16:30:59 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FGUxNO007295
	for perforce@freebsd.org; Fri, 15 Jul 2005 16:30:59 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 15 Jul 2005 16:30:59 GMT
Message-Id: <200507151630.j6FGUxNO007295@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 80278 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: Fri, 15 Jul 2005 16:31:01 -0000

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

Change 80278 by sam@sam_ebb on 2005/07/15 16:30:41

	get stuff working again after ifc

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#16 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#51 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#16 (text+ko) ====

@@ -149,6 +149,7 @@
 #define	M_LINK0		M_PROTO1		/* WEP requested */
 #define	M_PWR_SAV	M_PROTO4		/* bypass PS handling */
 #define	M_MORE_DATA	M_PROTO5		/* more data frames to follow */
+#define	M_FF		0x20000			/* fast frame */
 /*
  * Encode WME access control bits in the PROTO flags.
  * This is safe since it's passed directly in to the

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#51 (text+ko) ====

@@ -140,7 +140,7 @@
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
-	int len, hdrspace;
+	int hdrspace;
 	u_int8_t dir, type, subtype;
 	u_int8_t *bssid;
 	u_int16_t rxseq;