LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Tobias Diedrich <ranma+kernel@tdiedrich.de>
To: Ayaz Abdulla <aabdulla@nvidia.com>,
	David Ford <firefighterblu3@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Robert Hancock <hancockr@shaw.ca>,
	linux-kernel <linux-kernel@vger.kernel.org>,
	netdev@vger.kernel.org
Subject: Re: forcedeth problems on 2.6.20-rc6-mm3
Date: Fri, 9 Feb 2007 13:07:30 +0100	[thread overview]
Message-ID: <20070209120730.GA11911@melchior.yamamaya.is-a-geek.org> (raw)
In-Reply-To: <20070209115821.GD10330@melchior.yamamaya.is-a-geek.org>

Tobias Diedrich wrote:
> Ayaz Abdulla wrote:
> > For all those who are having issues, please try out the attached patch.
> 
> Will try.

Does not apply cleanly against 2.6.20, is this one fixed up right?
--- linux-2.6.20/drivers/net/forcedeth.c.orig	2007-02-09 13:02:02.000000000 +0100
+++ linux-2.6.20/drivers/net/forcedeth.c.new	2007-02-09 13:03:45.000000000 +0100
@@ -2603,10 +2603,16 @@
 	struct fe_priv *np = netdev_priv(dev);
 	u8 __iomem *base = get_hwbase(dev);
 	unsigned long flags;
+	u32 retcode;
 
-	pkts = nv_rx_process(dev, limit);
+	if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
+		pkts = nv_rx_process(dev, limit);
+		retcode = nv_alloc_rx(dev);
+	} else {
+		retcode = nv_alloc_rx_optimized(dev);
+	}
 
-	if (nv_alloc_rx(dev)) {
+	if (retcode) {
 		spin_lock_irqsave(&np->lock, flags);
 		if (!np->in_shutdown)
 			mod_timer(&np->oom_kick, jiffies + OOM_REFILL);

-- 
Tobias						PGP: http://9ac7e0bc.uguu.de
このメールは十割再利用されたビットで作られています。

  reply	other threads:[~2007-02-09 12:07 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-05  5:13 Robert Hancock
2007-02-05  5:36 ` Andrew Morton
2007-02-05  5:48   ` Robert Hancock
2007-02-05  6:17     ` Andrew Morton
     [not found]       ` <523e55a00702081326j43de05e3hdd8cf35e946eae9@mail.gmail.com>
2007-02-09  2:57         ` Ayaz Abdulla
2007-02-09 11:58           ` Tobias Diedrich
2007-02-09 12:07             ` Tobias Diedrich [this message]
2007-02-09 14:50               ` Jeff Garzik
2007-02-12  6:28                 ` Tobias Diedrich
2007-02-16 14:54                   ` Tobias Diedrich
2007-02-10  4:40           ` Robert Hancock
2007-02-05  6:34 ` Daniel Barkalow
2007-02-06  0:35   ` Robert Hancock
2007-02-06  0:52     ` Andrew Morton
2007-02-08  5:33       ` Andrew Morton
     [not found] <fa.EU4/Dq38S7AbpiJstT7NwokqTWE@ifi.uio.no>
     [not found] ` <fa.aMmqbeBS9CpIUWfPrgAtORtlXAQ@ifi.uio.no>
     [not found]   ` <fa.d8YTRl6o0OIk8Vvk1QLpyc+bxQU@ifi.uio.no>
     [not found]     ` <fa.XnyZ7qxKkAZ7Yhrg0DdiDmiy6wg@ifi.uio.no>
     [not found]       ` <fa.s8qbnOGnlEinPfyyhT0PZsqiwwE@ifi.uio.no>
     [not found]         ` <fa.6Uftu56OuKdbN+aI/fzLv4opZ/I@ifi.uio.no>
2007-02-20  0:39           ` Robert Hancock
2007-02-19 14:31             ` Ayaz Abdulla

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=20070209120730.GA11911@melchior.yamamaya.is-a-geek.org \
    --to=ranma+kernel@tdiedrich.de \
    --cc=aabdulla@nvidia.com \
    --cc=akpm@linux-foundation.org \
    --cc=firefighterblu3@gmail.com \
    --cc=hancockr@shaw.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --subject='Re: forcedeth problems on 2.6.20-rc6-mm3' \
    /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

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).