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

Commit 753f7661 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: fix bug when moving from 11gn to 11a or 11an to 11g 



It is wrong to set the rxon channel according to the ht-channel
in case there is a mismatch (e.g. when there is no ht).

Signed-off-by: default avatarGuy Cohen <guy.cohen@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 963f5517

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

+0 −1
Original line number Diff line number Diff line
@@ -597,7 +597,6 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info) 
		IWL_DEBUG_ASSOC("control diff than current %d %d\n",

				le16_to_cpu(rxon->channel),

				ht_info->control_channel);

		rxon->channel = cpu_to_le16(ht_info->control_channel);

		return;

	}

drivers/net/wireless/iwlwifi/iwl-dev.h

+0 −2
Original line number Diff line number Diff line
@@ -742,8 +742,6 @@ extern void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv, 
extern void iwl4965_init_ht_hw_capab(const struct iwl_priv *priv,

				struct ieee80211_ht_info *ht_info,

				enum ieee80211_band band);

void iwl4965_set_rxon_ht(struct iwl_priv *priv,

			 struct iwl_ht_info *ht_info);

int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,

				    enum ieee80211_ampdu_mlme_action action,

				    const u8 *addr, u16 tid, u16 *ssn);