On Thu, 16 Apr 2009, Kolbjørn Barmen wrote:

> After getting my ebuilds going, I compiled and installed 2.6.29 first on
> aranym, where it works just fine, and then on one of my A1200s. On the
> A1200 it seemed to work fine, for a while that is, suddenly the network
> stopped up - completely. Nothing in dmesg, but rmmod/modprobe apne does
> not make any difference, and I cant even ping 127.0.0.1 - so I guess this
> is the infamous 2.6.29 bug that was fixed in 2.6.29.1, and that is
> described here http://lkml.org/lkml/2009/3/27/421
> 
> So, I tryed to pull out a m68k-v2.6.29.1 from git, but appearantly there is no
> such thing. So¸ it is probably to add the "Disable GRO on legacy netif_rx
> path" patch (in posting above) to the v2.6.29 branch, no?
> 
> I will put it in locally now and see if it works for me.

This seems to have done the trick yes, the patch is this one:

diff --git a/net/core/dev.c b/net/core/dev.c
index 052dd47..63ec4bf 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2627,18 +2627,15 @@ static int process_backlog(struct napi_struct *napi, 
int quota)
                local_irq_disable();
                skb = __skb_dequeue(&queue->input_pkt_queue);
                if (!skb) {
+                       __napi_complete(napi);
                        local_irq_enable();
-                       napi_complete(napi);
-                       goto out;
+                       break;
                }
                local_irq_enable();
 
-               napi_gro_receive(napi, skb);
+               netif_receive_skb(skb);
        } while (++work < quota && jiffies == start_time);
 
-       napi_gro_flush(napi);
-
-out:
        return work;
 }

-- kolla
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to