summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_main.c
diff options
context:
space:
mode:
authorMichael Chan2009-12-26 02:13:07 +0100
committerDavid S. Miller2009-12-26 02:13:07 +0100
commit4a6e47a460ce55e283063fc3f7391c8ea46bea27 (patch)
treebd49dd1453c8bf0802a84c2ec30dfb8d270ccb10 /drivers/net/bnx2x_main.c
parentpktgen: ndo_start_xmit can return NET_XMIT_xxx values (diff)
downloadkernel-qcow2-linux-4a6e47a460ce55e283063fc3f7391c8ea46bea27.tar.gz
kernel-qcow2-linux-4a6e47a460ce55e283063fc3f7391c8ea46bea27.tar.xz
kernel-qcow2-linux-4a6e47a460ce55e283063fc3f7391c8ea46bea27.zip
bnx2x: Initialize cnic status block during chip reset
When the device is reset during MTU change, ring size change, or self test, etc, the cnic status block needs to be properly initialized if cnic is registered. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
-rw-r--r--drivers/net/bnx2x_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 77ba13520d87..306c2b8165e2 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -7593,6 +7593,8 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
if (bp->cnic_eth_dev.drv_state & CNIC_DRV_STATE_REGD) {
bnx2x_set_iscsi_eth_mac_addr(bp, 1);
bp->cnic_flags |= BNX2X_CNIC_FLAG_MAC_SET;
+ bnx2x_init_sb(bp, bp->cnic_sb, bp->cnic_sb_mapping,
+ CNIC_SB_ID(bp));
}
mutex_unlock(&bp->cnic_mutex);
#endif