Date: Mon, 19 Feb 2007 18:39:03 -0600
From: Robert Hancock <hancockr@shaw.ca>
Subject: Re: forcedeth problems on 2.6.20-rc6-mm3
In-reply-to: <fa.6Uftu56OuKdbN+aI/fzLv4opZ/I@ifi.uio.no>
To: Ayaz Abdulla <aabdulla@nvidia.com>,
       linux-kernel <linux-kernel@vger.kernel.org>, netdev@vger.kernel.org,
       Andrew Morton <akpm@osdl.org>
Cc: David Ford <firefighterblu3@gmail.com>
Message-id: <45DA4327.3010106@shaw.ca>
MIME-version: 1.0
Content-type: text/plain; charset=ISO-8859-1; format=flowed
Content-transfer-encoding: 7bit
References: <fa.EU4/Dq38S7AbpiJstT7NwokqTWE@ifi.uio.no>
 <fa.aMmqbeBS9CpIUWfPrgAtORtlXAQ@ifi.uio.no>
 <fa.d8YTRl6o0OIk8Vvk1QLpyc+bxQU@ifi.uio.no>
 <fa.XnyZ7qxKkAZ7Yhrg0DdiDmiy6wg@ifi.uio.no>
 <fa.s8qbnOGnlEinPfyyhT0PZsqiwwE@ifi.uio.no>
 <fa.6Uftu56OuKdbN+aI/fzLv4opZ/I@ifi.uio.no>
User-Agent: Thunderbird 1.5.0.9 (Windows/20061207)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2007
Lines: 60

Ayaz Abdulla wrote:
> 
> For all those who are having issues, please try out the attached patch.
> 
> Ayaz
> 
> 
> ----------------------------------------------------------------------------------- 
> 
> This email message is for the sole use of the intended recipient(s) and 
> may contain
> confidential information.  Any unauthorized review, use, disclosure or 
> distribution
> is prohibited.  If you are not the intended recipient, please contact 
> the sender by
> reply email and destroy all copies of the original message.
> ----------------------------------------------------------------------------------- 
> 
> 
> 
> ------------------------------------------------------------------------
> 
> --- orig/drivers/net/forcedeth.c	2007-02-08 21:41:59.000000000 -0500
> +++ new/drivers/net/forcedeth.c	2007-02-08 21:44:53.000000000 -0500
> @@ -3104,13 +3104,17 @@
>  	struct fe_priv *np = netdev_priv(dev);
>  	u8 __iomem *base = get_hwbase(dev);
>  	unsigned long flags;
> +	u32 retcode;
>  
> -	if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
> +	if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
>  		pkts = nv_rx_process(dev, limit);
> -	else
> +		retcode = nv_alloc_rx(dev);
> +	} else {
>  		pkts = nv_rx_process_optimized(dev, limit);
> +		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);

Did anyone push this patch into mainline? forcedeth on 2.6.20-git14 is 
still completely broken without this patch.

-- 
Robert Hancock      Saskatoon, SK, Canada
To email, remove "nospam" from hancockr@nospamshaw.ca
Home Page: http://www.roberthancock.com/


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/