diff options
| author |   Michael Chan <mchan@broadcom.com> | 2009-08-21 16:20:44 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-08-22 17:48:42 -0700 |
| commit | 3767546cc24de8f104e745d59a0a43a09d9267df (patch) | |
| tree | 91b6b1e9da1be490c5f632065b12b6aa19bb3041 | |
| parent | bnx2: Zero out status block before chip reset. (diff) | |
| download | linux-dev-3767546cc24de8f104e745d59a0a43a09d9267df.tar.xz linux-dev-3767546cc24de8f104e745d59a0a43a09d9267df.zip | |
bnx2: Check if_running() before touching chip registers.
Add this check to bnx2_netif_stop() and bnx2_vlan_rx_register() to
prevent bus lockups on some systems when the chip is in low power state.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bnx2.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index e75b6e94f652..9cfd46017e4e 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -619,6 +619,9 @@ bnx2_disable_int_sync(struct bnx2 *bp) int i; atomic_inc(&bp->intr_sem); + if (!netif_running(bp->dev)) + return; + bnx2_disable_int(bp); for (i = 0; i < bp->irq_nvecs; i++) synchronize_irq(bp->irq_tbl[i].vector); @@ -6254,9 +6257,14 @@ bnx2_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp) { struct bnx2 *bp = netdev_priv(dev); - bnx2_netif_stop(bp); + if (netif_running(dev)) + bnx2_netif_stop(bp); bp->vlgrp = vlgrp; + + if (!netif_running(dev)) + return; + bnx2_set_rx_mode(dev); if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) bnx2_fw_sync(bp, BNX2_DRV_MSG_CODE_KEEP_VLAN_UPDATE, 0, 1); |