mac80211: improve default WMM parameter setting
PATCH 1/1 mac80211: improve default WMM parameter setting
Move the default setting for WMM parameters outside the for loop to avoid redundant assignment multiple times.
Signed-off-by Fred Zhou <[email protected]>
--- net/mac80211/util.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
net/mac80211/util.c +15 -14
@@ -1007,14 +1007,21 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,*/ enable_qos = (sdata->vif.type !=NL80211_IFTYPE_STATION ); +/* Set defaults according to 802.11-2007 Table 7-37 */ + aCWmax =1023 ; +if (use_11b) + aCWmin =31 ; +else + aCWmin =15 ; + +/* Confiure old 802.11b/g medium access rules. */ + qparam.cw_max = aCWmax; + qparam.cw_min = aCWmin; + qparam.txop =0 ; + qparam.aifs =2 ; +for (ac =0 ; ac <IEEE80211_NUM_ACS ; ac++) { -/* Set defaults according to 802.11-2007 Table 7-37 */ - aCWmax =1023 ; -if (use_11b) - aCWmin =31 ; -else - aCWmin =15 ; - +/* Update if QoS is enabled. */ if (enable_qos) {switch (ac) {case IEEE80211_AC_BK :
@@ -1050,13 +1057,7 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata, qparam.aifs =2 ;break ; } - }else { -/* Confiure old 802.11b/g medium access rules. */ - qparam.cw_max = aCWmax; - qparam.cw_min = aCWmin; - qparam.txop =0 ; - qparam.aifs =2 ; - } + } qparam.uapsd = false;
Signature · 1 line
1.7.9.5
Quoted 2 lines · Fred Zhou
Move the default setting for WMM parameters outside the for loop to avoid redundant assignment multiple times.
Applied.
johannes