diff options
| author |   Amit Kumar Salecha <amit.salecha@qlogic.com> | 2009-12-05 12:23:55 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-12-08 20:37:45 -0800 |
| commit | f2251f668e9527b87c9ba7256e7497cb49abbc20 (patch) | |
| tree | bd0bc74ed3490b817f0fc9f5336867d202d5af90 /drivers/net/netxen/netxen_nic_main.c | |
| parent | netxen: protect device reset by rtnl_lock (diff) | |
| download | linux-dev-f2251f668e9527b87c9ba7256e7497cb49abbc20.tar.xz linux-dev-f2251f668e9527b87c9ba7256e7497cb49abbc20.zip | |
netxen:fix napi intr enable check
o netif_running() check for enabling interrupt at end of napi poll is
not enough to cover firmwar recovery. Instead test __NX_DEV_UP bit.
o Avoid re-entry into to netxen_nic_down() with __NX_DEV_UP bit check.
Acked-by: Dhananjay Phadke <dhananjay.phadke@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 8ffb30bc798f..f4996846a234 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -1011,8 +1011,10 @@ __netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev) if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC) return; - clear_bit(__NX_DEV_UP, &adapter->state); + if (!test_and_clear_bit(__NX_DEV_UP, &adapter->state)) + return; + smp_mb(); spin_lock(&adapter->tx_clean_lock); netif_carrier_off(netdev); netif_tx_disable(netdev); @@ -2053,7 +2055,7 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget) if ((work_done < budget) && tx_complete) { napi_complete(&sds_ring->napi); - if (netif_running(adapter->netdev)) + if (test_bit(__NX_DEV_UP, &adapter->state)) netxen_nic_enable_int(sds_ring); } |