diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index f5fdd5a63d4..28f1ffed81f 100644
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -157,8 +157,17 @@ struct ieee80211_qosframe_addr4 {
 #define	IEEE80211_FC0_SUBTYPE_CFPOLL		0x60
 #define	IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK	0x70
 #define	IEEE80211_FC0_SUBTYPE_QOS		0x80
+#define	IEEE80211_FC0_SUBTYPE_QOS_CFACK		0x90
+#define	IEEE80211_FC0_SUBTYPE_QOS_CFPOLL	0xa0
+#define	IEEE80211_FC0_SUBTYPE_QOS_CFACKPOLL	0xb0
 #define	IEEE80211_FC0_SUBTYPE_QOS_NULL		0xc0
 
+#define	IEEE80211_FC0_QOSDATA \
+	(IEEE80211_FC0_TYPE_DATA|IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_VERSION_0)
+
+#define	IEEE80211_IS_QOSDATA(wh) \
+	((wh)->i_fc[0] == IEEE80211_FC0_QOSDATA)
+
 #define	IEEE80211_FC1_DIR_MASK			0x03
 #define	IEEE80211_FC1_DIR_NODS			0x00	/* STA->STA */
 #define	IEEE80211_FC1_DIR_TODS			0x01	/* STA->AP  */
@@ -199,6 +208,8 @@ struct ieee80211_qosframe_addr4 {
 #define	IEEE80211_NWID_LEN			32
 #define	IEEE80211_MESHID_LEN			32
 
+#define	IEEE80211_QOS_CTL_LEN			2
+
 #define	IEEE80211_QOS_TXOP			0x00ff
 /* bit 8 is reserved */
 #define	IEEE80211_QOS_AMSDU			0x80