From: Dave Jones <davej@redhat.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: [PATCH] Fix velocity driver unmapping incorrect size.
Date: Sun, 21 Jun 2009 23:37:35 -0400 [thread overview]
Message-ID: <20090622033735.GA9923@redhat.com> (raw)
In-Reply-To: <20090621.184345.194558005.davem@davemloft.net>
Oh man, this was subtle. How did this never bite us before ?
--
When a packet is greater than ETH_ZLEN, we end up assigning the
boolean result of a comparison to the size we unmap.
Signed-off-by: Dave Jones <davej@redhat.com>
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index b02f7ad..46405e9 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1847,7 +1847,7 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_
*/
if (tdinfo->skb_dma) {
- pktlen = (skb->len > ETH_ZLEN ? : ETH_ZLEN);
+ pktlen = (skb->len > ETH_ZLEN ? skb->len : ETH_ZLEN);
for (i = 0; i < tdinfo->nskb_dma; i++) {
#ifdef VELOCITY_ZERO_COPY_SUPPORT
pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], le16_to_cpu(td->tdesc1.len), PCI_DMA_TODEVICE);
next prev parent reply other threads:[~2009-06-22 3:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-21 17:37 velocity driver unmaps incorrect size Dave Jones
2009-06-22 1:43 ` David Miller
2009-06-22 2:40 ` Dave Jones
2009-06-22 2:42 ` David Miller
2009-06-22 2:51 ` Dave Jones
2009-06-22 3:37 ` Dave Jones [this message]
2009-06-22 5:15 ` [PATCH] Fix velocity driver unmapping " Dave Jones
2009-06-22 5:35 ` [PATCH v2] " Dave Jones
2009-06-22 5:42 ` David Miller
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=20090622033735.GA9923@redhat.com \
--to=davej@redhat.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/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).