---

yaml --- r: 39413 b: refs/heads/master c: c3fee4c h: refs/heads/master i: 39411: c5fc6bd v: v3
git-mirror · Oct 11, 2006 · 8191444 · 8191444
1 parent c203e88
commit 8191444
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2874f2e8c3695953b9ec26d396d678a7128ee64
+refs/heads/master: c3fee4c55915c42b3278b65c91f9be8cee13426e
diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c
@@ -699,6 +699,8 @@ spider_net_release_tx_descr(struct spider_net_card *card)
 
 	/* unmap the skb */
 	skb = descr->skb;
+	if (!skb)
+		return;
 	pci_unmap_single(card->pdev, descr->buf_addr, skb->len,
 			PCI_DMA_TODEVICE);
 	dev_kfree_skb_any(skb);
@@ -751,7 +753,8 @@ spider_net_release_tx_chain(struct spider_net_card *card, int brutal)
 
 		default:
 			card->netdev_stats.tx_dropped++;
-			return 1;
+			if (!brutal)
+				return 1;
 		}
 		spider_net_release_tx_descr(card);
 	}