diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-02-07 11:58:58 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 09:41:29 +0100 |
| commit | 4a34215ef7487b1cbd783e7cc485eb03de893bd0 (patch) | |
| tree | 53fed3935c3a9e3138cf952c6ed95d32da05a796 /net/mac80211/mlme.c | |
| parent | Merge remote-tracking branch 'mac80211/master' into HEAD (diff) | |
| download | linux-dev-4a34215ef7487b1cbd783e7cc485eb03de893bd0.tar.xz linux-dev-4a34215ef7487b1cbd783e7cc485eb03de893bd0.zip | |
mac80211: pass station to ieee80211_vht_cap_ie_to_sta_vht_cap
Like with HT, make things a bit simpler in future patches by
passing the station to ieee80211_vht_cap_ie_to_sta_vht_cap()
instead of the vht_cap pointer. Also disable VHT here if HT
isn't supported.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index ac1374a8c30a..58b6e67ffbed 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2217,8 +2217,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, if (elems.vht_cap_elem && !(ifmgd->flags & IEEE80211_STA_DISABLE_VHT)) ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband, - elems.vht_cap_elem, - &sta->sta.vht_cap); + elems.vht_cap_elem, sta); rate_control_rate_init(sta); |