git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 26abf45ac80be4c54a63fecf1c3c1e1efb416e0a Mon Sep 17 00:00:00 2001
   2 From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
   3 Date: Wed, 1 Apr 2009 18:27:09 +0300
   4 Subject: [PATCH] Revert "gro: Fix legacy path napi_complete crash"
   5
   6 This reverts commit 303c6a0251852ecbdc5c15e466dcaff5971f7517.
   7
   8 Fixes USB network problems
   9 ---
  10  net/core/dev.c |    5 ++---
  11  1 files changed, 2 insertions(+), 3 deletions(-)
  12
  13 diff --git a/net/core/dev.c b/net/core/dev.c
  14 index e3fe5c7..c1e9dc0 100644
  15 --- a/net/core/dev.c
  16 +++ b/net/core/dev.c
  17 @@ -2588,9 +2588,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
  18                 local_irq_disable();
  19                 skb = __skb_dequeue(&queue->input_pkt_queue);
  20                 if (!skb) {
  21 +                       __napi_complete(napi);
  22                         local_irq_enable();
  23 -                       napi_complete(napi);
  24 -                       goto out;
  25 +                       break;
  26                 }
  27                 local_irq_enable();
  28
  29 @@ -2599,7 +2599,6 @@ static int process_backlog(struct napi_struct *napi, int quota)
  30
  31         napi_gro_flush(napi);
  32
  33 -out:
  34         return work;
  35  }
  36
  37 --
  38 1.5.6.5
  39