From: Anton Blanchard <anton@samba.org>
To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Yi Zou <yi.zou@intel.com>,
e1000-devel@lists.sourceforge.net,
Bruce Allan <bruce.w.allan@intel.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
John Ronciak <john.ronciak@intel.com>,
netdev@vger.kernel.org, Roel Kluin <roel.kluin@gmail.com>
Subject: Re: [PATCH 1/2] e1000: Fix DMA mapping error handling on TX
Date: Sun, 24 Jan 2010 11:47:53 +1100 [thread overview]
Message-ID: <20100124004753.GB2996@kryten> (raw)
In-Reply-To: <9929d2391001221940r4482dde4k8e5409bc7933bc21@mail.gmail.com>
Hi,
> This patch does not apply to the current e1000 driver in net-2.6, much
> of this patch has already been corrected (applied) by Roel Kluin
> recent patch.
Sorry I was basing off net-next. I just compared it to my fix and looks like
the patch in net-2.6 has an off by one error doesn't it?
Anton
--
Subject: [PATCH] e1000: Fix DMA mapping error handling on TX
e1000_tx_map has an off by one error in the dma mapping error cleanup path.
We decrement count and never clean the first successfully mapped descriptor.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index d29bb53..427cedd 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2790,8 +2790,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
dma_error:
dev_err(&pdev->dev, "TX DMA map failed\n");
buffer_info->dma = 0;
- if (count)
- count--;
while (count--) {
if (i==0)
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
next prev parent reply other threads:[~2010-01-24 0:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-21 11:42 [PATCH 1/2] e1000: Fix DMA mapping error handling on TX Anton Blanchard
2010-01-21 11:44 ` [PATCH 2/2] e1000: Fix DMA mapping error handling on RX Anton Blanchard
2010-01-23 3:42 ` Jeff Kirsher
2010-01-23 3:40 ` [PATCH 1/2] e1000: Fix DMA mapping error handling on TX Jeff Kirsher
2010-01-24 0:47 ` Anton Blanchard [this message]
2010-01-24 3:58 ` Jeff Kirsher
2010-01-26 15:59 ` Roel Kluin
2010-02-04 13:00 ` Roel Kluin
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=20100124004753.GB2996@kryten \
--to=anton@samba.org \
--cc=bruce.w.allan@intel.com \
--cc=e1000-devel@lists.sourceforge.net \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=john.ronciak@intel.com \
--cc=netdev@vger.kernel.org \
--cc=roel.kluin@gmail.com \
--cc=yi.zou@intel.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