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>
This commit is contained in:
committed by
John W. Linville
parent
40333e4fb4
commit
d9fe60dea7
@ -181,7 +181,7 @@ int iwl_send_add_sta(struct iwl_priv *priv,
|
||||
EXPORT_SYMBOL(iwl_send_add_sta);
|
||||
|
||||
static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index,
|
||||
struct ieee80211_ht_info *sta_ht_inf)
|
||||
struct ieee80211_sta_ht_cap *sta_ht_inf)
|
||||
{
|
||||
__le32 sta_flags;
|
||||
u8 mimo_ps_mode;
|
||||
@ -229,7 +229,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index,
|
||||
* iwl_add_station_flags - Add station to tables in driver and device
|
||||
*/
|
||||
u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap,
|
||||
u8 flags, struct ieee80211_ht_info *ht_info)
|
||||
u8 flags, struct ieee80211_sta_ht_cap *ht_info)
|
||||
{
|
||||
int i;
|
||||
int sta_id = IWL_INVALID_STATION;
|
||||
@ -894,7 +894,7 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
|
||||
|
||||
/* Add station to device's station table */
|
||||
struct ieee80211_conf *conf = &priv->hw->conf;
|
||||
struct ieee80211_ht_info *cur_ht_config = &conf->ht_conf;
|
||||
struct ieee80211_sta_ht_cap *cur_ht_config = &conf->ht_cap;
|
||||
|
||||
if ((is_ap) &&
|
||||
(conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) &&
|
||||
|
Reference in New Issue
Block a user