svn commit: r254526 - in head/sys: net80211 sys

[Andre Oppermann]

Author: andre
Date: Mon Aug 19 14:07:31 2013
New Revision: 254526
URL: http://svnweb.freebsd.org/changeset/base/254526

Log:
  Migrate the net80211 protocol specific use of M_FRAG, M_FIRSTFRAG and
  M_LASTFRAG flags to protocol specific flags.
  
  Remove the now unused M_FRAG, M_FIRSTFRAG and M_LASTFRAG mbuf flags.
  
  Discussed with:	trociny, glebius, adrian

Modified:
  head/sys/net80211/ieee80211_freebsd.h
  head/sys/sys/mbuf.h

Modified: head/sys/net80211/ieee80211_freebsd.h
==============================================================================
--- head/sys/net80211/ieee80211_freebsd.h	Mon Aug 19 14:04:35 2013	(r254525)
+++ head/sys/net80211/ieee80211_freebsd.h	Mon Aug 19 14:07:31 2013	(r254526)
@@ -234,9 +234,12 @@ struct mbuf *ieee80211_getmgtframe(uint8
 #define	M_FF		M_PROTO6		/* fast frame */
 #define	M_TXCB		M_PROTO7		/* do tx complete callback */
 #define	M_AMPDU_MPDU	M_PROTO8		/* ok for A-MPDU aggregation */
+#define	M_FRAG		M_PROTO9		/* frame fragmentation */
+#define	M_FIRSTFRAG	M_PROTO10		/* first frame fragment */
+#define	M_LASTFRAG	M_PROTO11		/* last frame fragment */
 #define	M_80211_TX \
-	(M_FRAG|M_FIRSTFRAG|M_LASTFRAG|M_ENCAP|M_EAPOL|M_PWR_SAV|\
-	 M_MORE_DATA|M_FF|M_TXCB|M_AMPDU_MPDU)
+	(M_ENCAP|M_EAPOL|M_PWR_SAV|M_MORE_DATA|M_FF|M_TXCB| \
+	 M_AMPDU_MPDU|M_FRAG|M_FIRSTFRAG|M_LASTFRAG)
 
 /* rx path usage */
 #define	M_AMPDU		M_PROTO1		/* A-MPDU subframe */

Modified: head/sys/sys/mbuf.h
==============================================================================
--- head/sys/sys/mbuf.h	Mon Aug 19 14:04:35 2013	(r254525)
+++ head/sys/sys/mbuf.h	Mon Aug 19 14:07:31 2013	(r254526)
@@ -193,9 +193,9 @@ struct mbuf {
 #define	M_PROTO5	0x00000100 /* protocol-specific */
 #define	M_BCAST		0x00000200 /* send/received as link-level broadcast */
 #define	M_MCAST		0x00000400 /* send/received as link-level multicast */
-#define	M_FRAG		0x00000800 /* packet is a fragment of a larger packet */
-#define	M_FIRSTFRAG	0x00001000 /* packet is first fragment */
-#define	M_LASTFRAG	0x00002000 /* packet is last fragment */
+		     /*	0x00000800    free */
+		     /*	0x00001000    free */
+		     /*	0x00002000    free */
 #define	M_PROTO9	0x00004000 /* protocol-specific */
 #define	M_PROTO10	0x00008000 /* protocol-specific */
 #define	M_VLANTAG	0x00010000 /* ether_vtag is valid */
@@ -254,7 +254,7 @@ struct mbuf {
  */
 #define	M_COPYFLAGS \
     (M_PKTHDR|M_EOR|M_RDONLY|M_PROTOFLAGS|M_BCAST|M_MCAST|\
-     M_FRAG|M_FIRSTFRAG|M_LASTFRAG|M_VLANTAG|M_PROMISC|M_HASHTYPEBITS)
+     M_VLANTAG|M_PROMISC|M_HASHTYPEBITS)
 
 /*
  * External buffer types: identify ext_buf type.