From 8191444099a8b45439bbc0aef11bfbb501b6529c Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Tue, 10 Oct 2006 16:00:04 -0500 Subject: [PATCH] --- yaml --- r: 39413 b: refs/heads/master c: c3fee4c55915c42b3278b65c91f9be8cee13426e h: refs/heads/master i: 39411: c5fc6bd24f90d4c4d2200262db271fbde4e7f941 v: v3 --- [refs] | 2 +- trunk/drivers/net/spider_net.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 00ad83ddb984..2d968bd4ef7e 100644 --- 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 index ff409a10274e..52bf1b2968b3 100644 --- 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); }