Commit b580a372 authored by Johannes Berg's avatar Johannes Berg

wifi: mac80211: mlme: clarify WMM messages

These messages apply to a single link only, use link_info()
to indicate that.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230608163202.21a6bece4313.I08118e5e851fae2f9e43f8a58d3b6217709bf578@changeidSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c6968d4f
...@@ -2639,9 +2639,9 @@ ieee80211_sta_wmm_params(struct ieee80211_local *local, ...@@ -2639,9 +2639,9 @@ ieee80211_sta_wmm_params(struct ieee80211_local *local,
params[ac].aifs = pos[0] & 0x0f; params[ac].aifs = pos[0] & 0x0f;
if (params[ac].aifs < 2) { if (params[ac].aifs < 2) {
sdata_info(sdata, link_info(link,
"AP has invalid WMM params (AIFSN=%d for ACI %d), will use 2\n", "AP has invalid WMM params (AIFSN=%d for ACI %d), will use 2\n",
params[ac].aifs, aci); params[ac].aifs, aci);
params[ac].aifs = 2; params[ac].aifs = 2;
} }
params[ac].cw_max = ecw2cw((pos[1] & 0xf0) >> 4); params[ac].cw_max = ecw2cw((pos[1] & 0xf0) >> 4);
...@@ -2652,9 +2652,9 @@ ieee80211_sta_wmm_params(struct ieee80211_local *local, ...@@ -2652,9 +2652,9 @@ ieee80211_sta_wmm_params(struct ieee80211_local *local,
if (params[ac].cw_min == 0 || if (params[ac].cw_min == 0 ||
params[ac].cw_min > params[ac].cw_max) { params[ac].cw_min > params[ac].cw_max) {
sdata_info(sdata, link_info(link,
"AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n", "AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n",
params[ac].cw_min, params[ac].cw_max, aci); params[ac].cw_min, params[ac].cw_max, aci);
return false; return false;
} }
ieee80211_regulatory_limit_wmm_params(sdata, &params[ac], ac); ieee80211_regulatory_limit_wmm_params(sdata, &params[ac], ac);
...@@ -2663,9 +2663,9 @@ ieee80211_sta_wmm_params(struct ieee80211_local *local, ...@@ -2663,9 +2663,9 @@ ieee80211_sta_wmm_params(struct ieee80211_local *local,
/* WMM specification requires all 4 ACIs. */ /* WMM specification requires all 4 ACIs. */
for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
if (params[ac].cw_min == 0) { if (params[ac].cw_min == 0) {
sdata_info(sdata, link_info(link,
"AP has invalid WMM params (missing AC %d), using defaults\n", "AP has invalid WMM params (missing AC %d), using defaults\n",
ac); ac);
return false; return false;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment