Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63d41769 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 57f8db89

drivers/net/wireless/iwlwifi/iwl-sta.c

+6 −4
Original line number Diff line number Diff line
@@ -284,9 +284,11 @@ static u8 iwl_prep_station(struct iwl_priv *priv, const u8 *addr, 
	station->sta.sta.sta_id = sta_id;

	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 &&

	    priv->iw_mode != NL80211_IFTYPE_ADHOC)

	/*

	 * OK to call unconditionally, since local stations (IBSS BSSID

	 * STA and broadcast STA) pass in a NULL ht_info, and mac80211

	 * doesn't allow HT IBSS.

	 */

	iwl_set_ht_add_station(priv, sta_id, ht_info);



	/* 3945 only */