* [e100 2.6] fix stray skb pointer
@ 2004-03-12 23:52 Feldman, Scott
2004-03-13 2:41 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Feldman, Scott @ 2004-03-12 23:52 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, Feldman, Scott, dsaxena
* Not setting cb->skb = NULL after releasing skb to OS or during
initialization of cbs. Reported by Deepak Saxena
[dsaxena@plexity.net].
----------
--- linux-2.5/drivers/net/e100.c 2004-03-12 15:32:07.000000000 -0800
+++ linux-2.5/drivers/net/e100.c.mod 2004-03-12 15:32:31.000000000 -0800
@@ -158,7 +158,7 @@
#define DRV_NAME "e100"
-#define DRV_VERSION "3.0.16"
+#define DRV_VERSION "3.0.17"
#define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver"
#define DRV_COPYRIGHT "Copyright(c) 1999-2004 Intel Corporation"
#define PFX DRV_NAME ": "
@@ -1285,6 +1285,7 @@ static inline int e100_tx_clean(struct n
le16_to_cpu(cb->u.tcb.tbd.size),
PCI_DMA_TODEVICE);
dev_kfree_skb_any(cb->skb);
+ cb->skb = NULL;
tx_cleaned = 1;
}
cb->status = 0;
@@ -1347,6 +1348,7 @@ static int e100_alloc_cbs(struct nic *ni
cb->dma_addr = nic->cbs_dma_addr + i * sizeof(struct cb);
cb->link = cpu_to_le32(nic->cbs_dma_addr +
((i+1) % count) * sizeof(struct cb));
+ cb->skb = NULL;
}
nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = nic->cbs;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [e100 2.6] fix stray skb pointer
2004-03-12 23:52 [e100 2.6] fix stray skb pointer Feldman, Scott
@ 2004-03-13 2:41 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2004-03-13 2:41 UTC (permalink / raw)
To: Feldman, Scott; +Cc: netdev, dsaxena
applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-03-13 2:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-03-12 23:52 [e100 2.6] fix stray skb pointer Feldman, Scott
2004-03-13 2:41 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).