diff options
-rw-r--r-- | include/net/mac80211.h | 2 | ||||
-rw-r--r-- | net/mac80211/mlme.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 4f693a5c54de..b77d57a070e5 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -128,6 +128,7 @@ enum ieee80211_ac_numbers { | |||
128 | * 2^n-1 in the range 1..32767] | 128 | * 2^n-1 in the range 1..32767] |
129 | * @cw_max: maximum contention window [like @cw_min] | 129 | * @cw_max: maximum contention window [like @cw_min] |
130 | * @txop: maximum burst time in units of 32 usecs, 0 meaning disabled | 130 | * @txop: maximum burst time in units of 32 usecs, 0 meaning disabled |
131 | * @acm: is mandatory admission control required for the access category | ||
131 | * @uapsd: is U-APSD mode enabled for the queue | 132 | * @uapsd: is U-APSD mode enabled for the queue |
132 | */ | 133 | */ |
133 | struct ieee80211_tx_queue_params { | 134 | struct ieee80211_tx_queue_params { |
@@ -135,6 +136,7 @@ struct ieee80211_tx_queue_params { | |||
135 | u16 cw_min; | 136 | u16 cw_min; |
136 | u16 cw_max; | 137 | u16 cw_max; |
137 | u8 aifs; | 138 | u8 aifs; |
139 | bool acm; | ||
138 | bool uapsd; | 140 | bool uapsd; |
139 | }; | 141 | }; |
140 | 142 | ||
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index f7beb12abde2..13bb81402e1f 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -1661,6 +1661,7 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local, | |||
1661 | params.cw_max = ecw2cw((pos[1] & 0xf0) >> 4); | 1661 | params.cw_max = ecw2cw((pos[1] & 0xf0) >> 4); |
1662 | params.cw_min = ecw2cw(pos[1] & 0x0f); | 1662 | params.cw_min = ecw2cw(pos[1] & 0x0f); |
1663 | params.txop = get_unaligned_le16(pos + 2); | 1663 | params.txop = get_unaligned_le16(pos + 2); |
1664 | params.acm = acm; | ||
1664 | params.uapsd = uapsd; | 1665 | params.uapsd = uapsd; |
1665 | 1666 | ||
1666 | mlme_dbg(sdata, | 1667 | mlme_dbg(sdata, |