From 09a0d5999161ea055f03c2e7b51feea32f747f12 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 27 Nov 2007 16:26:36 -0800 Subject: [PATCH] --- yaml --- r: 74486 b: refs/heads/master c: f7bbb9098315d712351aba7861a8c9fcf6bf0213 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eac2097a269d..bf64e9e813ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e970d1f8106514ea619d7a9005b1dc92c6049b32 +refs/heads/master: f7bbb9098315d712351aba7861a8c9fcf6bf0213 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index cf39473ef90a..4f37506ad374 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -3942,7 +3942,7 @@ e1000_clean(struct napi_struct *napi, int budget) &work_done, budget); /* If no Tx and not enough Rx work done, exit the polling mode */ - if ((!tx_cleaned && (work_done < budget)) || + if ((!tx_cleaned && (work_done == 0)) || !netif_running(poll_dev)) { quit_polling: if (likely(adapter->itr_setting & 3))