diff options
| author | Eddie Wai <eddie.wai@broadcom.com> | 2011-02-16 15:04:27 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-24 12:38:52 -0500 |
| commit | a977d2c9dc463ab080e0aa8ebe563bdc414ee44f (patch) | |
| tree | c1139bface46084c980f90ce7b5df75435c98cdd /drivers/scsi/bnx2i | |
| parent | ee15bd2da6a7c671e1b0095a3f128be9366b4db9 (diff) | |
| download | linux-stable-a977d2c9dc463ab080e0aa8ebe563bdc414ee44f.tar.gz linux-stable-a977d2c9dc463ab080e0aa8ebe563bdc414ee44f.tar.bz2 linux-stable-a977d2c9dc463ab080e0aa8ebe563bdc414ee44f.zip | |
[SCSI] bnx2i: Added handling for unsupported iSCSI offload hba
The hba will now be unregistered and freed when iSCSI offload
is not supported by the NIC.
Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/bnx2i')
| -rw-r--r-- | drivers/scsi/bnx2i/bnx2i_init.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c index 72a7b2d4a439..6afaa34222af 100644 --- a/drivers/scsi/bnx2i/bnx2i_init.c +++ b/drivers/scsi/bnx2i/bnx2i_init.c @@ -161,6 +161,21 @@ void bnx2i_start(void *handle) struct bnx2i_hba *hba = handle; int i = HZ; + if (!hba->cnic->max_iscsi_conn) { + printk(KERN_ALERT "bnx2i: dev %s does not support " + "iSCSI\n", hba->netdev->name); + + if (test_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic)) { + mutex_lock(&bnx2i_dev_lock); + list_del_init(&hba->link); + adapter_count--; + hba->cnic->unregister_device(hba->cnic, CNIC_ULP_ISCSI); + clear_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic); + mutex_unlock(&bnx2i_dev_lock); + bnx2i_free_hba(hba); + } + return; + } bnx2i_send_fw_iscsi_init_msg(hba); while (!test_bit(ADAPTER_STATE_UP, &hba->adapter_state) && i--) msleep(BNX2I_INIT_POLL_TIME); |