PERFORCE change 119848 for review

[Sam Leffler]

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

Change 119848 by sam at 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