summaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip
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/tulip
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/tulip')
-rw-r--r--drivers/net/tulip/interrupt.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 0461956..6284afd 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -117,9 +117,6 @@ int tulip_poll(struct napi_struct *napi, int budget)
int received = 0;
#endif
- if (!netif_running(dev))
- goto done;
-
#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
/* that one buffer is needed for mit activation; or might be a
@@ -261,8 +258,6 @@ int tulip_poll(struct napi_struct *napi, int budget)
* finally: amount of IO did not increase at all. */
} while ((ioread32(tp->base_addr + CSR5) & RxIntr));
-done:
-
#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
/* We use this simplistic scheme for IM. It's proven by
OpenPOWER on IntegriCloud