---

yaml --- r: 369595 b: refs/heads/master c: 908f8d0 h: refs/heads/master i: 369593: 41e5bad 369591: 5eae1a0 v: v3
git-mirror · Apr 22, 2013 · b515bf1 · b515bf1
1 parent 52d9ed6
commit b515bf1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e3ab5543bed9dffb7d1a6404c3782284a432a70
+refs/heads/master: 908f8d07e9774c2476e0683f6a0ce50562a2da45
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
@@ -128,13 +128,15 @@ enum ieee80211_ac_numbers {
  *	2^n-1 in the range 1..32767]
  * @cw_max: maximum contention window [like @cw_min]
  * @txop: maximum burst time in units of 32 usecs, 0 meaning disabled
+ * @acm: is mandatory admission control required for the access category
  * @uapsd: is U-APSD mode enabled for the queue
  */
 struct ieee80211_tx_queue_params {
 	u16 txop;
 	u16 cw_min;
 	u16 cw_max;
 	u8 aifs;
+	bool acm;
 	bool uapsd;
 };
 

diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
@@ -1661,6 +1661,7 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local,
 		params.cw_max = ecw2cw((pos[1] & 0xf0) >> 4);
 		params.cw_min = ecw2cw(pos[1] & 0x0f);
 		params.txop = get_unaligned_le16(pos + 2);
+		params.acm = acm;
 		params.uapsd = uapsd;
 
 		mlme_dbg(sdata,