summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinas Vepstas <linas@austin.ibm.com>2006-10-11 01:00:04 +0400
committerJeff Garzik <jeff@garzik.org>2006-10-11 12:04:25 +0400
commitc3fee4c55915c42b3278b65c91f9be8cee13426e (patch)
tree171c86bbbed7af79d373aeda531052b0a64e4190
parente2874f2e8c3695953b9ec26d396d678a7128ee64 (diff)
downloadlinux-c3fee4c55915c42b3278b65c91f9be8cee13426e.tar.xz
[PATCH] powerpc/cell spidernet force-end fix
Bugfix: when cleaning up the transmit queue upon device close, be sure to walk the entire queue. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Cc: James K Lewis <jklewis@us.ibm.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/spider_net.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index ff409a10274e..52bf1b2968b3 100644
--- a/drivers/net/spider_net.c
+++ b/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);
}