History

mac80211: set QoS capability before changing station state

In the upcoming fast-xmit patch, changing station state will build a header cache based on the station's capabilities, and as the QoS capability (sta.wme) impacts the header, it needs to be set before.

Johannes Berg committed 11 years ago

Commit 2c44be81 parent 070e1761 file · +4 −4Browse files

Unified · Split

net/mac80211/cfg.c+4−4
@@ -1059,6 +1059,10 @@ static int sta_apply_parameters(struct ieee80211_local *local, · 1058 unmodified lines
10591059 }
10601060 }
10611061
1062+ if (mask & BIT(NL80211_STA_FLAG_WME) &&
1063+ local->hw.queues >= IEEE80211_NUM_ACS)
1064+ sta->sta.wme = set & BIT(NL80211_STA_FLAG_WME);
1065+
10621066 /* auth flags will be set later for TDLS stations */
10631067 if (!test_sta_flag(sta, WLAN_STA_TDLS_PEER)) {
10641068 ret = sta_apply_auth_flags(local, sta, mask, set);
@@ -1073,10 +1077,6 @@ static int sta_apply_parameters(struct ieee80211_local *local, · 8 unmodified lines
10731077 clear_sta_flag(sta, WLAN_STA_SHORT_PREAMBLE);
10741078 }
10751079
1076− if (mask & BIT(NL80211_STA_FLAG_WME) &&
1077− local->hw.queues >= IEEE80211_NUM_ACS)
1078− sta->sta.wme = set & BIT(NL80211_STA_FLAG_WME);
1079−
10801080 if (mask & BIT(NL80211_STA_FLAG_MFP)) {
10811081 sta->sta.mfp = !!(set & BIT(NL80211_STA_FLAG_MFP));
10821082 if (set & BIT(NL80211_STA_FLAG_MFP))

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t