From owner-svn-src-stable@FreeBSD.ORG  Sat Nov 22 23:48:33 2008
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E6F9D1065674;
	Sat, 22 Nov 2008 23:48:33 +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 D00888FC24;
	Sat, 22 Nov 2008 23:48:33 +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 mAMNmXTK032613;
	Sat, 22 Nov 2008 23:48:33 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAMNmXf3032612;
	Sat, 22 Nov 2008 23:48:33 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200811222348.mAMNmXf3032612@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sat, 22 Nov 2008 23:48:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185190 - stable/7/sys/net80211
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Nov 2008 23:48:34 -0000

Author: sam
Date: Sat Nov 22 23:48:33 2008
New Revision: 185190
URL: http://svn.freebsd.org/changeset/base/185190

Log:
  change private mbuf flags to use M_PROTO* so they don't conflict with public
  definitions; note this constitutes an ABI change so drivers that use M_TXCB
  or M_FF must be recompiled
  
  Approved by:	re (kib)

Modified:
  stable/7/sys/net80211/ieee80211_freebsd.h

Modified: stable/7/sys/net80211/ieee80211_freebsd.h
==============================================================================
--- stable/7/sys/net80211/ieee80211_freebsd.h	Sat Nov 22 22:15:34 2008	(r185189)
+++ stable/7/sys/net80211/ieee80211_freebsd.h	Sat Nov 22 23:48:33 2008	(r185190)
@@ -197,9 +197,10 @@ struct mbuf *ieee80211_getmgtframe(uint8
 #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 */
-#define	M_80211_TX	(0x60000|M_PROTO1|M_WME_AC_MASK|M_PROTO4|M_PROTO5)
+#define	M_FF		M_PROTO6		/* fast frame */
+#define	M_TXCB		M_PROTO7		/* do tx complete callback */
+#define	M_80211_TX \
+	(M_LINK0|M_WME_AC_MASK|M_PWR_SAV|M_MORE_DATA|M_FF|M_TXCB)
 
 /* rx path usage */
 #define	M_AMPDU		M_PROTO1		/* A-MPDU processing done */