diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-03-26 00:59:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 22:24:28 -0700 |
| commit | 8f1ead2d1a626ed0c85b3d2c2046a49081d5933f (patch) | |
| tree | 4bb6e9672a6ec13bb2388f535642d374d4353eb6 | |
| parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
| download | linux-3.10-8f1ead2d1a626ed0c85b3d2c2046a49081d5933f.tar.gz linux-3.10-8f1ead2d1a626ed0c85b3d2c2046a49081d5933f.tar.bz2 linux-3.10-8f1ead2d1a626ed0c85b3d2c2046a49081d5933f.zip | |
GRO: Disable GRO on legacy netif_rx path
When I fixed the GRO crash in the legacy receive path I used
napi_complete to replace __napi_complete. Unfortunately they're
not the same when NETPOLL is enabled, which may result in us
not calling __napi_complete at all.
What's more, we really do need to keep the __napi_complete call
within the IRQ-off section since in theory an IRQ can occur in
between and fill up the backlog to the maximum, causing us to
lock up.
Since we can't seem to find a fix that works properly right now,
this patch reverts all the GRO support from the netif_rx path.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 052dd478d3e..63ec4bf89b2 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; } |