diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-09-20 16:46:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:41:11 -0700 |
| commit | f5f582e5a75724793895cc191ba7a8d2c05f59f4 (patch) | |
| tree | e8a700be3433b58d88254aab4dc28bb7b5b1c5dc /drivers | |
| parent | c7015062c18e619796e8d9c76a5fe7f300f80b7d (diff) | |
| download | kernel_samsung_smdk4412-f5f582e5a75724793895cc191ba7a8d2c05f59f4.zip kernel_samsung_smdk4412-f5f582e5a75724793895cc191ba7a8d2c05f59f4.tar.gz kernel_samsung_smdk4412-f5f582e5a75724793895cc191ba7a8d2c05f59f4.tar.bz2 | |
iwlegacy: fix command queue timeout
commit 2e2a41d6ca07d1b2aa67015c35fd80701c98e867 upstream.
iwlegacy version of fix:
commit 282cdb325aea4ebbc42ce753b47cc96145eb54bc
Author: Johannes Berg <johannes.berg@intel.com>
Date: Mon Sep 12 12:09:10 2011 -0700
iwlagn: fix command queue timeout
If the command queue is constantly busy,
which can happen in P2P, the hangcheck
timer will frequently find a command in
it and will eventually reset the device
because nothing sets the timestamp for
this queue when commands are processed.
Fix this by setting the timestamp when
a command completes.
iwlegacy does not support P2P, but this patch fix possible
unneeded hardware resets, hence is needed.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-tx.c b/drivers/net/wireless/iwlegacy/iwl-tx.c index 4fff995..4b4489f 100644 --- a/drivers/net/wireless/iwlegacy/iwl-tx.c +++ b/drivers/net/wireless/iwlegacy/iwl-tx.c @@ -625,6 +625,8 @@ iwl_legacy_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) cmd = txq->cmd[cmd_index]; meta = &txq->meta[cmd_index]; + txq->time_stamp = jiffies; + pci_unmap_single(priv->pci_dev, dma_unmap_addr(meta, mapping), dma_unmap_len(meta, len), |