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>

1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index e23d9a52d083..3f236b546683 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -563,19 +563,18 @@ static int __init init_mac80211_hwsim(void)
                 data->band.n_channels = ARRAY_SIZE(hwsim_channels);
                 data->band.bitrates = data->rates;
                 data->band.n_bitrates = ARRAY_SIZE(hwsim_rates);
-                data->band.ht_info.ht_supported = 1;
-                data->band.ht_info.cap = IEEE80211_HT_CAP_SUP_WIDTH |
+                data->band.ht_cap.ht_supported = true;
+                data->band.ht_cap.cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
                         IEEE80211_HT_CAP_GRN_FLD |
                         IEEE80211_HT_CAP_SGI_40 |
                         IEEE80211_HT_CAP_DSSSCCK40;
-                data->band.ht_info.ampdu_factor = 0x3;
-                data->band.ht_info.ampdu_density = 0x6;
-                memset(data->band.ht_info.supp_mcs_set, 0,
-                       sizeof(data->band.ht_info.supp_mcs_set));
-                data->band.ht_info.supp_mcs_set[0] = 0xff;
-                data->band.ht_info.supp_mcs_set[1] = 0xff;
-                data->band.ht_info.supp_mcs_set[12] =
-                        IEEE80211_HT_CAP_MCS_TX_DEFINED;
+                data->band.ht_cap.ampdu_factor = 0x3;
+                data->band.ht_cap.ampdu_density = 0x6;
+                memset(&data->band.ht_cap.mcs, 0,
+                       sizeof(data->band.ht_cap.mcs));
+                data->band.ht_cap.mcs.rx_mask[0] = 0xff;
+                data->band.ht_cap.mcs.rx_mask[1] = 0xff;
+                data->band.ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
                 hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &data->band;
 
                 err = ieee80211_register_hw(hw);