40 lines
973 B
Diff
40 lines
973 B
Diff
From 26abf45ac80be4c54a63fecf1c3c1e1efb416e0a Mon Sep 17 00:00:00 2001
|
|
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
|
|
Date: Wed, 1 Apr 2009 18:27:09 +0300
|
|
Subject: [PATCH] Revert "gro: Fix legacy path napi_complete crash"
|
|
|
|
This reverts commit 303c6a0251852ecbdc5c15e466dcaff5971f7517.
|
|
|
|
Fixes USB network problems
|
|
---
|
|
net/core/dev.c | 5 ++---
|
|
1 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/net/core/dev.c b/net/core/dev.c
|
|
index e3fe5c7..c1e9dc0 100644
|
|
--- a/net/core/dev.c
|
|
+++ b/net/core/dev.c
|
|
@@ -2588,9 +2588,9 @@ 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();
|
|
|
|
@@ -2599,7 +2599,6 @@ static int process_backlog(struct napi_struct *napi, int quota)
|
|
|
|
napi_gro_flush(napi);
|
|
|
|
-out:
|
|
return work;
|
|
}
|
|
|
|
--
|
|
1.5.6.5
|
|
|