From 085410db83c5182d44b3e80f61f4a49943e2b3a1 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bzhao@marvell.com>
Date: Thu, 9 Dec 2010 18:24:41 -0800
Subject: [PATCH] --- yaml --- r: 225247 b: refs/heads/master c:
 44316cb1e97a1e7f76eb3f07e5b0ba91d72e9693 h: refs/heads/master i:   225245:
 7805586d44a42bb04f8bd80edb3882520a8bb400   225243:
 d565a6e158940cd1af66e9d83c6c43d8e825a542   225239:
 d7474f22964cdcab3cde856158bd16d345e9e47c   225231:
 0db81aa21521bb7c239e6a53946c55c7dcf65d25   225215:
 59d2f1e01e0c1a23d615cb2ea5d90596f7d208a4 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/ieee80211.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4cf7f81740f6..08d117d78193 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91f44b02992f632ac6c070f985cd58d5acee4199
+refs/heads/master: 44316cb1e97a1e7f76eb3f07e5b0ba91d72e9693
diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h
index 351c0ab4e284..7f2354534242 100644
--- a/trunk/include/linux/ieee80211.h
+++ b/trunk/include/linux/ieee80211.h
@@ -122,6 +122,7 @@
 
 /* U-APSD queue for WMM IEs sent by AP */
 #define IEEE80211_WMM_IE_AP_QOSINFO_UAPSD	(1<<7)
+#define IEEE80211_WMM_IE_AP_QOSINFO_PARAM_SET_CNT_MASK	0x0f
 
 /* U-APSD queues for WMM IEs sent by STA */
 #define IEEE80211_WMM_IE_STA_QOSINFO_AC_VO	(1<<0)