iwlwifi: fix bug when moving from 11gn to 11a or 11an to 11g
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 12 Jun 2008 01:47:01 +0000 (09:47 +0800)
committerJohn W. Linville <linville@tuxdriver.com>
Sat, 14 Jun 2008 16:18:06 +0000 (12:18 -0400)
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: Guy Cohen <guy.cohen@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-dev.h

index fad26f71d7ce60c15d8ddc9e59aff51818227e51..7d0a2576d8f9eb2702da52e6d18dc5d78752fb1c 100644 (file)
@@ -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;
        }
 
index daa14d9e5a802e118fb9f14d9c8aad729fca3bb6..ac68cced6da85dd200cee0d947b996980f6dd70e 100644 (file)
@@ -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);