diff options
| author | Divy Le Ray <divy@chelsio.com> | 2009-05-28 13:23:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-29 10:54:41 +0200 |
| commit | c22c8149313ee85c912e7b77a7afd04be8b8cba8 (patch) | |
| tree | 84f18d574d01a0e7222c54f38d8e9cba9ba1c468 /drivers/net/cxgb3/cxgb3_main.c | |
| parent | cxgb3: fix dma mapping regression (diff) | |
| download | linux-c22c8149313ee85c912e7b77a7afd04be8b8cba8.tar.xz linux-c22c8149313ee85c912e7b77a7afd04be8b8cba8.zip | |
cxgb3: link fault fixes
Do not call t3_link_fault() under spinlock, as it calls msleep().
Besides, only the access to pi->link_fault needs to be serialized.
Also initialize local variables before checking the link status,
link state fields might otherwise end up containing garbage.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 7ea48414c6cb..17858b9a5830 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -2496,14 +2496,16 @@ static void check_link_status(struct adapter *adapter) for_each_port(adapter, i) { struct net_device *dev = adapter->port[i]; struct port_info *p = netdev_priv(dev); + int link_fault; spin_lock_irq(&adapter->work_lock); - if (p->link_fault) { + link_fault = p->link_fault; + spin_unlock_irq(&adapter->work_lock); + + if (link_fault) { t3_link_fault(adapter, i); - spin_unlock_irq(&adapter->work_lock); continue; } - spin_unlock_irq(&adapter->work_lock); if (!(p->phy.caps & SUPPORTED_IRQ) && netif_running(dev)) { t3_xgm_intr_disable(adapter, i); |