Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 908f8d07 authored by Alexander Bondar's avatar Alexander Bondar Committed by Johannes Berg
Browse files

mac80211: indicate admission control in TX queue parameters 



Some driver implementations need to know whether mandatory
admission control is required by the AP for some ACs. Add
a parameter to the TX queue parameters indicating this.

As there's currently no support for admission control in
mac80211's AP implementation, it's only ever set for the
client implementation.

Signed-off-by: default avatarAlexander Bondar <alexander.bondar@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6e3ab554

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 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 {
@@ -135,6 +136,7 @@ struct ieee80211_tx_queue_params { 
	u16 cw_min;

	u16 cw_max;

	u8 aifs;

	bool acm;

	bool uapsd;

};

net/mac80211/mlme.c

+1 −0
Original line number Diff line number Diff line
@@ -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,