Re: forcedeth problems on 2.6.20-rc6-mm3

From: Ayaz Abdulla
Date: Mon Feb 19 2007 - 19:49:30 EST




Robert Hancock wrote:
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.


I have submitted the patch to netdev mailing list.

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