From: Anton Blanchard <anton@samba.org>
To: netdev@oss.sgi.com
Cc: cramerj@intel.com, john.ronciak@intel.com, ganesh.venkatesan@intel.com
Subject: e1000_clean_tx_ring
Date: Fri, 25 Jun 2004 09:23:11 +1000 [thread overview]
Message-ID: <20040624232311.GG22495@krispykreme> (raw)
Hi,
I was looking over the e1000 driver and noticed what I think is a bug
in e1000_clean_tx_ring. We wouldnt call pci_unmap_page on tx ring
entries that didnt have ->skb filled, eg zero copy packets.
This is on latest 2.6 BK.
Anton
===== e1000_main.c 1.120 vs edited =====
--- 1.120/drivers/net/e1000/e1000_main.c Sat Jun 19 10:00:00 2004
+++ edited/e1000_main.c Thu Jun 24 02:16:42 2004
@@ -1070,14 +1070,19 @@
for(i = 0; i < tx_ring->count; i++) {
buffer_info = &tx_ring->buffer_info[i];
- if(buffer_info->skb) {
+ if (buffer_info->dma) {
pci_unmap_page(pdev,
buffer_info->dma,
buffer_info->length,
PCI_DMA_TODEVICE);
- dev_kfree_skb(buffer_info->skb);
+ buffer_info->dma = NULL;
+ }
+
+ if (buffer_info->skb) {
+
+ dev_kfree_skb_any(buffer_info->skb);
buffer_info->skb = NULL;
}
next reply other threads:[~2004-06-24 23:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-06-24 23:23 Anton Blanchard [this message]
-- strict thread matches above, loose matches on Subject: below --
2004-06-28 22:11 e1000_clean_tx_ring Venkatesan, Ganesh
2004-06-29 8:08 ` e1000_clean_tx_ring David Greaves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040624232311.GG22495@krispykreme \
--to=anton@samba.org \
--cc=cramerj@intel.com \
--cc=ganesh.venkatesan@intel.com \
--cc=john.ronciak@intel.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).