diff options
| author | David S. Miller <davem@davemloft.net> | 2008-01-08 05:48:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-09 08:30:09 +0100 |
| commit | 4ec2411980d0fd2995e8dea8a06fe57aa47523cb (patch) | |
| tree | a4013547ff1bda8fc038623290debd62ad6dd7fe /drivers/net/qla3xxx.c | |
| parent | [NET]: Add NAPI_STATE_DISABLE. (diff) | |
| download | linux-4ec2411980d0fd2995e8dea8a06fe57aa47523cb.tar.xz linux-4ec2411980d0fd2995e8dea8a06fe57aa47523cb.zip | |
[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/qla3xxx.c')
| -rw-r--r-- | drivers/net/qla3xxx.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index a5791114b7bd..cf0774de6c41 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -2320,14 +2320,9 @@ static int ql_poll(struct napi_struct *napi, int budget) unsigned long hw_flags; struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; - if (!netif_carrier_ok(ndev)) - goto quit_polling; - ql_tx_rx_clean(qdev, &tx_cleaned, &rx_cleaned, budget); - if (tx_cleaned + rx_cleaned != budget || - !netif_running(ndev)) { -quit_polling: + if (tx_cleaned + rx_cleaned != budget) { spin_lock_irqsave(&qdev->hw_lock, hw_flags); __netif_rx_complete(ndev, napi); ql_update_small_bufq_prod_index(qdev); |