mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 11:51:27 +00:00
iwlwifi: remove pointless HT check
Remove the check before invoking iwl_set_ht_add_station(), since neither of the conditions in this check makes sense, as either we pass in a NULL ht_info (first branch) or in the IBSS case an ht_info with ht_enabled=false. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
This commit is contained in:
parent
57f8db8934
commit
63d4176933
@ -284,10 +284,12 @@ static u8 iwl_prep_station(struct iwl_priv *priv, const u8 *addr,
|
|||||||
station->sta.sta.sta_id = sta_id;
|
station->sta.sta.sta_id = sta_id;
|
||||||
station->sta.station_flags = 0;
|
station->sta.station_flags = 0;
|
||||||
|
|
||||||
/* BCAST station and IBSS stations do not work in HT mode */
|
/*
|
||||||
if (sta_id != priv->hw_params.bcast_sta_id &&
|
* OK to call unconditionally, since local stations (IBSS BSSID
|
||||||
priv->iw_mode != NL80211_IFTYPE_ADHOC)
|
* STA and broadcast STA) pass in a NULL ht_info, and mac80211
|
||||||
iwl_set_ht_add_station(priv, sta_id, ht_info);
|
* doesn't allow HT IBSS.
|
||||||
|
*/
|
||||||
|
iwl_set_ht_add_station(priv, sta_id, ht_info);
|
||||||
|
|
||||||
/* 3945 only */
|
/* 3945 only */
|
||||||
rate = (priv->band == IEEE80211_BAND_5GHZ) ?
|
rate = (priv->band == IEEE80211_BAND_5GHZ) ?
|
||||||
|
Loading…
Reference in New Issue
Block a user