git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream/ticketlock-cleanup' of git://github.com/jsgf/linux-xen into...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-trans-tx-pcie.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
b/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
index
a6b2b1d
..
222d410
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
@@
-771,6
+771,8
@@
void iwl_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;
+
iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
/* Input error checking is done when commands are added to queue. */