diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-27 15:47:33 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-27 15:47:33 -0400 |
| commit | a8acfd82ebefbb32f12f413019e53f9e939cf44e (patch) | |
| tree | 77ed527122c81600681eb86f2bfc9829b1af20d8 /drivers/net/wireless/iwlegacy/iwl-tx.c | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
| parent | ba54238552625aad2d75f455a4d3db18ea7dec68 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-tx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-tx.c b/drivers/net/wireless/iwlegacy/iwl-tx.c index 4fff995c6f3..ef9e268bf8a 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), @@ -645,7 +647,7 @@ iwl_legacy_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) clear_bit(STATUS_HCMD_ACTIVE, &priv->status); IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command %s\n", iwl_legacy_get_cmd_string(cmd->hdr.cmd)); - wake_up_interruptible(&priv->wait_command_queue); + wake_up(&priv->wait_command_queue); } /* Mark as unmapped */ |