diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 9f51d3a61f36..ad45249454f0 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -2783,9 +2783,9 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2783 | tx_resp->failure_frame); | 2783 | tx_resp->failure_frame); |
2784 | 2784 | ||
2785 | IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index); | 2785 | IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index); |
2786 | #ifdef CONFIG_IWL4965_HT | ||
2786 | if (index != -1) { | 2787 | if (index != -1) { |
2787 | int freed = iwl4965_tx_queue_reclaim(priv, txq_id, index); | 2788 | int freed = iwl4965_tx_queue_reclaim(priv, txq_id, index); |
2788 | #ifdef CONFIG_IWL4965_HT | ||
2789 | if (tid != MAX_TID_COUNT) | 2789 | if (tid != MAX_TID_COUNT) |
2790 | priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; | 2790 | priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; |
2791 | if (iwl4965_queue_space(&txq->q) > txq->q.low_mark && | 2791 | if (iwl4965_queue_space(&txq->q) > txq->q.low_mark && |
@@ -2793,9 +2793,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2793 | ieee80211_wake_queue(priv->hw, txq_id); | 2793 | ieee80211_wake_queue(priv->hw, txq_id); |
2794 | if (tid != MAX_TID_COUNT) | 2794 | if (tid != MAX_TID_COUNT) |
2795 | iwl4965_check_empty_hw_queue(priv, sta_id, tid, txq_id); | 2795 | iwl4965_check_empty_hw_queue(priv, sta_id, tid, txq_id); |
2796 | #endif | ||
2797 | } | 2796 | } |
2798 | #ifdef CONFIG_IWL4965_HT | ||
2799 | } | 2797 | } |
2800 | #endif /* CONFIG_IWL4965_HT */ | 2798 | #endif /* CONFIG_IWL4965_HT */ |
2801 | 2799 | ||
@@ -5124,7 +5122,7 @@ static void iwl4965_post_associate(struct iwl_priv *priv) | |||
5124 | 5122 | ||
5125 | #ifdef CONFIG_IWL4965_HT | 5123 | #ifdef CONFIG_IWL4965_HT |
5126 | if (priv->current_ht_config.is_ht) | 5124 | if (priv->current_ht_config.is_ht) |
5127 | iwl4965_set_rxon_ht(priv, &priv->current_ht_config); | 5125 | iwl_set_rxon_ht(priv, &priv->current_ht_config); |
5128 | #endif /* CONFIG_IWL4965_HT*/ | 5126 | #endif /* CONFIG_IWL4965_HT*/ |
5129 | iwl_set_rxon_chain(priv); | 5127 | iwl_set_rxon_chain(priv); |
5130 | priv->staging_rxon.assoc_id = cpu_to_le16(priv->assoc_id); | 5128 | priv->staging_rxon.assoc_id = cpu_to_le16(priv->assoc_id); |