aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index fad26f71d7ce..7d0a2576d8f9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -597,7 +597,6 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info)
597 IWL_DEBUG_ASSOC("control diff than current %d %d\n", 597 IWL_DEBUG_ASSOC("control diff than current %d %d\n",
598 le16_to_cpu(rxon->channel), 598 le16_to_cpu(rxon->channel),
599 ht_info->control_channel); 599 ht_info->control_channel);
600 rxon->channel = cpu_to_le16(ht_info->control_channel);
601 return; 600 return;
602 } 601 }
603 602
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index daa14d9e5a80..ac68cced6da8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -742,8 +742,6 @@ extern void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv,
742extern void iwl4965_init_ht_hw_capab(const struct iwl_priv *priv, 742extern void iwl4965_init_ht_hw_capab(const struct iwl_priv *priv,
743 struct ieee80211_ht_info *ht_info, 743 struct ieee80211_ht_info *ht_info,
744 enum ieee80211_band band); 744 enum ieee80211_band band);
745void iwl4965_set_rxon_ht(struct iwl_priv *priv,
746 struct iwl_ht_info *ht_info);
747int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw, 745int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
748 enum ieee80211_ampdu_mlme_action action, 746 enum ieee80211_ampdu_mlme_action action,
749 const u8 *addr, u16 tid, u16 *ssn); 747 const u8 *addr, u16 tid, u16 *ssn);