aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-09 06:13:49 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:00:06 -0400
commitd9fe60dea7779d412b34679f1177c5ca1940ea8d (patch)
treea51e16b013f7c1d16ded502cb32c03872bcbfcaa /net/mac80211/cfg.c
parent40333e4fb476014cdd939d27e20eb54573172b32 (diff)
802.11: clean up/fix HT support
This patch cleans up a number of things: * the unusable definition of the HT capabilities/HT information information elements * variable names that are hard to understand * mac80211: move ieee80211_handle_ht to ht.c and remove the unused enable_ht parameter * mac80211: fix bug with MCS rate 32 in ieee80211_handle_ht * mac80211: fix bug with casting the result of ieee80211_bss_get_ie to an information element _contents_ rather than the whole element, add size checking (another out-of-bounds access bug fixed!) * mac80211: remove some unused return values in favour of BUG_ON checking * a few minor other things Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index cf3fd5d60665..a5dea617aab3 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -633,10 +633,9 @@ static void sta_apply_parameters(struct ieee80211_local *local,
633 sta->sta.supp_rates[local->oper_channel->band] = rates; 633 sta->sta.supp_rates[local->oper_channel->band] = rates;
634 } 634 }
635 635
636 if (params->ht_capa) { 636 if (params->ht_capa)
637 ieee80211_ht_cap_ie_to_ht_info(params->ht_capa, 637 ieee80211_ht_cap_ie_to_sta_ht_cap(params->ht_capa,
638 &sta->sta.ht_info); 638 &sta->sta.ht_cap);
639 }
640 639
641 if (ieee80211_vif_is_mesh(&sdata->vif) && params->plink_action) { 640 if (ieee80211_vif_is_mesh(&sdata->vif) && params->plink_action) {
642 switch (params->plink_action) { 641 switch (params->plink_action) {