diff options
| author | David S. Miller | 2009-03-17 15:01:30 -0700 |
|---|---|---|
| committer | David S. Miller | 2009-03-17 15:01:30 -0700 |
| commit | 2d6a5e9500103680464a723a4564961675652680 (patch) | |
| tree | d18903333aae8a4415b179d6e7d38f203724892c /net/core/dev.c | |
| parent | bd257ed9f1d129b4e881f513a406b435c8852565 (diff) | |
| parent | f10023a4ef3f5cc05457b059c6880bc447adfa1f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/igb/igb_main.c
drivers/net/qlge/qlge_main.c
drivers/net/wireless/ath9k/ath9k.h
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/hw.c
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 7bd3c29c5a78..c01303129119 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2627,9 +2627,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(); - break; + napi_complete(napi); + goto out; } local_irq_enable(); @@ -2638,6 +2638,7 @@ static int process_backlog(struct napi_struct *napi, int quota) napi_gro_flush(napi); +out: return work; } |