diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 4748d067eb1..6788ceb3768 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -2238,12 +2238,8 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2238 | 2238 | ||
2239 | if (priv->mac80211_registered && | 2239 | if (priv->mac80211_registered && |
2240 | (iwl_queue_space(&txq->q) > txq->q.low_mark) && | 2240 | (iwl_queue_space(&txq->q) > txq->q.low_mark) && |
2241 | (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) { | 2241 | (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) |
2242 | if (agg->state == IWL_AGG_OFF) | 2242 | iwl_wake_queue(priv, txq); |
2243 | iwl_wake_queue(priv, txq_id); | ||
2244 | else | ||
2245 | iwl_wake_queue(priv, txq->swq_id); | ||
2246 | } | ||
2247 | } | 2243 | } |
2248 | } else { | 2244 | } else { |
2249 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 2245 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
@@ -2267,7 +2263,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2267 | 2263 | ||
2268 | if (priv->mac80211_registered && | 2264 | if (priv->mac80211_registered && |
2269 | (iwl_queue_space(&txq->q) > txq->q.low_mark)) | 2265 | (iwl_queue_space(&txq->q) > txq->q.low_mark)) |
2270 | iwl_wake_queue(priv, txq_id); | 2266 | iwl_wake_queue(priv, txq); |
2271 | } | 2267 | } |
2272 | if (qc && likely(sta_id != IWL_INVALID_STATION)) | 2268 | if (qc && likely(sta_id != IWL_INVALID_STATION)) |
2273 | iwlagn_txq_check_empty(priv, sta_id, tid, txq_id); | 2269 | iwlagn_txq_check_empty(priv, sta_id, tid, txq_id); |
@@ -2620,6 +2616,7 @@ static struct iwl_base_params iwl4965_base_params = { | |||
2620 | .ucode_tracing = true, | 2616 | .ucode_tracing = true, |
2621 | .sensitivity_calib_by_driver = true, | 2617 | .sensitivity_calib_by_driver = true, |
2622 | .chain_noise_calib_by_driver = true, | 2618 | .chain_noise_calib_by_driver = true, |
2619 | .no_agg_framecnt_info = true, | ||
2623 | }; | 2620 | }; |
2624 | 2621 | ||
2625 | struct iwl_cfg iwl4965_agn_cfg = { | 2622 | struct iwl_cfg iwl4965_agn_cfg = { |
@@ -2627,7 +2624,6 @@ struct iwl_cfg iwl4965_agn_cfg = { | |||
2627 | .fw_name_pre = IWL4965_FW_PRE, | 2624 | .fw_name_pre = IWL4965_FW_PRE, |
2628 | .ucode_api_max = IWL4965_UCODE_API_MAX, | 2625 | .ucode_api_max = IWL4965_UCODE_API_MAX, |
2629 | .ucode_api_min = IWL4965_UCODE_API_MIN, | 2626 | .ucode_api_min = IWL4965_UCODE_API_MIN, |
2630 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | ||
2631 | .valid_tx_ant = ANT_AB, | 2627 | .valid_tx_ant = ANT_AB, |
2632 | .valid_rx_ant = ANT_ABC, | 2628 | .valid_rx_ant = ANT_ABC, |
2633 | .eeprom_ver = EEPROM_4965_EEPROM_VERSION, | 2629 | .eeprom_ver = EEPROM_4965_EEPROM_VERSION, |
@@ -2635,6 +2631,7 @@ struct iwl_cfg iwl4965_agn_cfg = { | |||
2635 | .ops = &iwl4965_ops, | 2631 | .ops = &iwl4965_ops, |
2636 | .mod_params = &iwlagn_mod_params, | 2632 | .mod_params = &iwlagn_mod_params, |
2637 | .base_params = &iwl4965_base_params, | 2633 | .base_params = &iwl4965_base_params, |
2634 | .led_mode = IWL_LED_BLINK, | ||
2638 | /* | 2635 | /* |
2639 | * Force use of chains B and C for scan RX on 5 GHz band | 2636 | * Force use of chains B and C for scan RX on 5 GHz band |
2640 | * because the device has off-channel reception on chain A. | 2637 | * because the device has off-channel reception on chain A. |