diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-12 21:20:53 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-12 21:20:53 +0200 |
| commit | b1f90866fb3a329b1c4ebfff93ae9c110943e50a (patch) | |
| tree | 9c765f6d21c8cad4906a2d1eb1b26f4f9842a3d6 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
| parent | mac80211: check whether scan is in progress before queueing scan_work (diff) | |
| parent | iwlwifi: avoid Tx queue memory allocation in interface down (diff) | |
| download | linux-b1f90866fb3a329b1c4ebfff93ae9c110943e50a.tar.xz linux-b1f90866fb3a329b1c4ebfff93ae9c110943e50a.zip | |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 8c889fdddf0e..2e3cda75f3ad 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -2054,8 +2054,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, if (qc && likely(sta_id != IWL_INVALID_STATION)) iwlagn_txq_check_empty(priv, sta_id, tid, txq_id); - if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) - IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n"); + iwl_check_abort_status(priv, tx_resp->frame_count, status); } static int iwl4965_calc_rssi(struct iwl_priv *priv, @@ -2255,6 +2254,7 @@ struct iwl_cfg iwl4965_agn_cfg = { .monitor_recover_period = IWL_MONITORING_PERIOD, .temperature_kelvin = true, .off_channel_workaround = true, + .max_event_log_size = 512, }; /* Module firmware */ |