---

yaml --- r: 202873 b: refs/heads/master c: 4f5fa23 h: refs/heads/master i: 202871: 49803c5 v: v3
git-mirror · Jun 6, 2010 · 6b3ac10 · 6b3ac10
1 parent 9dc971c
commit 6b3ac10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc66be2a808724d61134e420ef9d7082653c72eb
+refs/heads/master: 4f5fa2376f3ca46fa497632844872a6f4e224c09
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-3945.c b/trunk/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -705,16 +705,18 @@ void iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
 	for (i = 1; i < counter; i++) {
 		pci_unmap_single(dev, le32_to_cpu(tfd->tbs[i].addr),
 			 le32_to_cpu(tfd->tbs[i].len), PCI_DMA_TODEVICE);
-		if (txq->txb[txq->q.read_ptr].skb[0]) {
-			struct sk_buff *skb = txq->txb[txq->q.read_ptr].skb[0];
-			if (txq->txb[txq->q.read_ptr].skb[0]) {
-				/* Can be called from interrupt context */
+		if (txq->txb) {
+			struct sk_buff *skb;
+
+			skb = txq->txb[txq->q.read_ptr].skb[i - 1];
+
+			/* can be called from irqs-disabled context */
+			if (skb) {
 				dev_kfree_skb_any(skb);
-				txq->txb[txq->q.read_ptr].skb[0] = NULL;
+				txq->txb[txq->q.read_ptr].skb[i - 1] = NULL;
 			}
 		}
 	}
-	return ;
 }
 
 /**