diff options
author | David S. Miller <davem@davemloft.net> | 2008-01-07 23:48:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-09 02:30:09 -0500 |
commit | 4ec2411980d0fd2995e8dea8a06fe57aa47523cb (patch) | |
tree | a4013547ff1bda8fc038623290debd62ad6dd7fe /drivers/net/s2io.c | |
parent | a0a46196cd98af5cc015842bba757571f02a8c30 (diff) |
[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/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 9d80f1cf73a..fa57c49c0c5 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -2704,9 +2704,6 @@ static int s2io_poll(struct napi_struct *napi, int budget) | |||
2704 | struct XENA_dev_config __iomem *bar0 = nic->bar0; | 2704 | struct XENA_dev_config __iomem *bar0 = nic->bar0; |
2705 | int i; | 2705 | int i; |
2706 | 2706 | ||
2707 | if (!is_s2io_card_up(nic)) | ||
2708 | return 0; | ||
2709 | |||
2710 | mac_control = &nic->mac_control; | 2707 | mac_control = &nic->mac_control; |
2711 | config = &nic->config; | 2708 | config = &nic->config; |
2712 | 2709 | ||