summaryrefslogtreecommitdiffstats
path: root/drivers/net/e100.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-01-07 20:48:21 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-08 23:30:09 -0800
commit4ec2411980d0fd2995e8dea8a06fe57aa47523cb (patch)
treea4013547ff1bda8fc038623290debd62ad6dd7fe /drivers/net/e100.c
parenta0a46196cd98af5cc015842bba757571f02a8c30 (diff)
downloadop-kernel-dev-4ec2411980d0fd2995e8dea8a06fe57aa47523cb.zip
op-kernel-dev-4ec2411980d0fd2995e8dea8a06fe57aa47523cb.tar.gz
[NET]: Do not check netif_running() and carrier state in ->poll()
Drivers do this to try to break out of the ->poll()'ing loop when the device is being brought administratively down. Now that we have a napi_disable() "pending" state we are going to solve that problem generically. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r--drivers/net/e100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 2b06e4b..68316f1 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1997,7 +1997,7 @@ static int e100_poll(struct napi_struct *napi, int budget)
tx_cleaned = e100_tx_clean(nic);
/* If no Rx and Tx cleanup work was done, exit polling mode. */
- if((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) {
+ if((!tx_cleaned && (work_done == 0))) {
netif_rx_complete(netdev, napi);
e100_enable_irq(nic);
}
OpenPOWER on IntegriCloud