From a12b307ddea72174af2126559f5f5fe14e91fa2c Mon Sep 17 00:00:00 2001 From: Toshiharu Okada Date: Sun, 25 Sep 2011 21:27:42 +0000 Subject: [PATCH] --- yaml --- r: 264263 b: refs/heads/master c: 5f3a11419099d5cc010cfbfc524ca10d8fb81f89 h: refs/heads/master i: 264261: 09ad0b30f40cd8e645767a4063de16239853515e 264259: a438dfda64abdae501570265f089a60abe034964 264255: 4f6ad5763a8159c51fbebfe39f85a7d66ef23cce v: v3 --- [refs] | 2 +- trunk/drivers/net/pch_gbe/pch_gbe_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c25b798d27d0..55faa2249775 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7091fbd82cd5686444ffe9935ed6a8190101fe9d +refs/heads/master: 5f3a11419099d5cc010cfbfc524ca10d8fb81f89 diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_main.c b/trunk/drivers/net/pch_gbe/pch_gbe_main.c index 567ff10889be..5474189d320b 100644 --- a/trunk/drivers/net/pch_gbe/pch_gbe_main.c +++ b/trunk/drivers/net/pch_gbe/pch_gbe_main.c @@ -2195,7 +2195,7 @@ static int pch_gbe_napi_poll(struct napi_struct *napi, int budget) /* If no Tx and not enough Rx work done, * exit the polling mode */ - if ((work_done < budget) || !netif_running(netdev)) + if (work_done < budget) poll_end_flag = true; }