forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cnic, bnx2i: Fix bug on some bnx2x devices that don't support iSCSI

Browse source 
On some bnx2x devices, iSCSI is determined to be unsupported only after
firmware is downloaded.  We need to check max_iscsi_conn again after
NETDEV_UP and block iSCSI init operations.  Without this fix, iscsiadm
can hang as the firmware will not respond to the iSCSI init message.

Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2013-08-02 11:28:23 -07:00 • committed by David S. Miller
parent 4b42df5da8
commit 9e9402eb45
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/ethernet/broadcom/cnic.c
View file

@ -5276,6 +5276,13 @@ static int cnic_register_netdev(struct cnic_dev *dev)
if (err)
netdev_err(dev->netdev, "register_cnic failed\n");
/* Read iSCSI config again. On some bnx2x device, iSCSI config
* can change after firmware is downloaded.
*/
dev->max_iscsi_conn = ethdev->max_iscsi_conn;
if (ethdev->drv_state & CNIC_DRV_STATE_NO_ISCSI)
dev->max_iscsi_conn = 0;
return err;
}