1 files changed, 4 insertions, 9 deletions

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 0487461ae4da..dc1d20cf64ee 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -1248,14 +1248,7 @@ il3945_rx_handle(struct il_priv *il)
                 len = le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK;
                 len += sizeof(u32);     /* account for status word */
 
-                /* Reclaim a command buffer only if this packet is a response
-                 *   to a (driver-originated) command.
-                 * If the packet (e.g. Rx frame) originated from uCode,
-                 *   there is no command buffer to reclaim.
-                 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,
-                 *   but apparently a few don't get set; catch them here. */
-                reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) &&
-                    pkt->hdr.cmd != N_STATS && pkt->hdr.cmd != C_TX;
+                reclaim = il_need_reclaim(il, pkt);
 
                 /* Based on type of command response or notification,
                  *   handle those that need handling via function in
@@ -1495,12 +1488,14 @@ il3945_irq_tasklet(struct il_priv *il)
         if (inta & CSR_INT_BIT_WAKEUP) {
                 D_ISR("Wakeup interrupt\n");
                 il_rx_queue_update_write_ptr(il, &il->rxq);
+
+                spin_lock_irqsave(&il->lock, flags);
                 il_txq_update_write_ptr(il, &il->txq[0]);
                 il_txq_update_write_ptr(il, &il->txq[1]);
                 il_txq_update_write_ptr(il, &il->txq[2]);
                 il_txq_update_write_ptr(il, &il->txq[3]);
                 il_txq_update_write_ptr(il, &il->txq[4]);
-                il_txq_update_write_ptr(il, &il->txq[5]);
+                spin_unlock_irqrestore(&il->lock, flags);
 
                 il->isr_stats.wakeup++;
                 handled |= CSR_INT_BIT_WAKEUP;