openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Chan 2009-08-21 16:20:44 +00:00 committed by David S. Miller
parent 155d5561f5
commit 3767546cc2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/bnx2.c
View File

@ -619,6 +619,9 @@ bnx2_disable_int_sync(struct bnx2 *bp)
int i; int i;
atomic_inc(&bp->intr_sem); atomic_inc(&bp->intr_sem);
if (!netif_running(bp->dev))
return;
bnx2_disable_int(bp); bnx2_disable_int(bp);
for (i = 0; i < bp->irq_nvecs; i++) for (i = 0; i < bp->irq_nvecs; i++)
synchronize_irq(bp->irq_tbl[i].vector); 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); struct bnx2 *bp = netdev_priv(dev);
bnx2_netif_stop(bp); if (netif_running(dev))
bnx2_netif_stop(bp);
bp->vlgrp = vlgrp; bp->vlgrp = vlgrp;
if (!netif_running(dev))
return;
bnx2_set_rx_mode(dev); bnx2_set_rx_mode(dev);
if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN)
bnx2_fw_sync(bp, BNX2_DRV_MSG_CODE_KEEP_VLAN_UPDATE, 0, 1); bnx2_fw_sync(bp, BNX2_DRV_MSG_CODE_KEEP_VLAN_UPDATE, 0, 1);