From owner-p4-projects@FreeBSD.ORG  Mon May 14 18:26:15 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 B319E16A405; Mon, 14 May 2007 18:26:15 +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 8603116A40D
	for <perforce@freebsd.org>; Mon, 14 May 2007 18:26:15 +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 768CB13C4B7
	for <perforce@freebsd.org>; Mon, 14 May 2007 18:26:15 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4EIQF0M049226
	for <perforce@freebsd.org>; Mon, 14 May 2007 18:26:15 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4EIQFcO049210
	for perforce@freebsd.org; Mon, 14 May 2007 18:26:15 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 14 May 2007 18:26:15 GMT
Message-Id: <200705141826.l4EIQFcO049210@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 119848 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, 14 May 2007 18:26:16 -0000

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

Change 119848 by sam@sam_ebb on 2007/05/14 18:25:22

	bandaid conflicting use of M_PROTO5; switch M_AMPDU to M_PROTO1
	Noticed by:	sephe

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#28 edit

Differences ...

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

@@ -186,13 +186,14 @@
 #define time_before_eq(a,b)	time_after_eq(b,a)
 
 struct mbuf *ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen);
+/* tx path usage */
 #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 */
 #define	M_TXCB		0x40000			/* do tx complete callback */
 /* rx path usage */
-#define	M_AMPDU		M_PROTO5		/* A-MPDU processing done */
+#define	M_AMPDU		M_PROTO1		/* A-MPDU processing done */
 /*
  * Encode WME access control bits in the PROTO flags.
  * This is safe since it's passed directly in to the