aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorMarek Kwaczynski <marek.kwaczynski@tieto.com>2014-02-03 08:44:44 -0500
committerJohannes Berg <johannes.berg@intel.com>2014-02-05 08:03:23 -0500
commitb1bce14a7954790d0fd3bba29375a65aa96fc57c (patch)
tree167db77bcc08a2241de6aba667508aebf17f792c /net/mac80211/cfg.c
parent9752482083066af7ac18a5ca376ff35d72418b29 (diff)
mac80211: update opmode when adding new station
Update the operating mode field is needed when an association request contains the operating mode notification element and it's not just changed later on the fly. Signed-off-by: Marek Kwaczynski <marek.kwaczynski@tieto.com> [clarify commit log, comments & fix whitespace] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 875e63d3d9c5..8192093f1e8b 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1344,6 +1344,18 @@ static int sta_apply_parameters(struct ieee80211_local *local,
1344 ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband, 1344 ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband,
1345 params->vht_capa, sta); 1345 params->vht_capa, sta);
1346 1346
1347 if (params->opmode_notif_used) {
1348 enum ieee80211_band band =
1349 ieee80211_get_sdata_band(sdata);
1350
1351 /* returned value is only needed for rc update, but the
1352 * rc isn't initialized here yet, so ignore it
1353 */
1354 __ieee80211_vht_handle_opmode(sdata, sta,
1355 params->opmode_notif,
1356 band, false);
1357 }
1358
1347 if (ieee80211_vif_is_mesh(&sdata->vif)) { 1359 if (ieee80211_vif_is_mesh(&sdata->vif)) {
1348#ifdef CONFIG_MAC80211_MESH 1360#ifdef CONFIG_MAC80211_MESH
1349 u32 changed = 0; 1361 u32 changed = 0;