openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Alexander Bondar <alexander.bondar@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Alexander Bondar 2013-04-07 09:53:30 +03:00 committed by Johannes Berg
parent 6e3ab5543b
commit 908f8d07e9
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/mac80211.h
View File

@ -128,6 +128,7 @@ enum ieee80211_ac_numbers {
* 2^n-1 in the range 1..32767] * 2^n-1 in the range 1..32767]
* @cw_max: maximum contention window [like @cw_min] * @cw_max: maximum contention window [like @cw_min]
* @txop: maximum burst time in units of 32 usecs, 0 meaning disabled * @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 * @uapsd: is U-APSD mode enabled for the queue
*/ */
struct ieee80211_tx_queue_params { struct ieee80211_tx_queue_params {
@ -135,6 +136,7 @@ struct ieee80211_tx_queue_params {
u16 cw_min; u16 cw_min;
u16 cw_max; u16 cw_max;
u8 aifs; u8 aifs;
bool acm;
bool uapsd; bool uapsd;
}; };

1
net/mac80211/mlme.c
View File

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