diff options
| author | Eddie Wai <eddie.wai@broadcom.com> | 2010-08-12 16:44:29 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-09-05 14:50:08 -0300 |
| commit | 2c2255e08dee510c68d641195f83d40899897c65 (patch) | |
| tree | 7ffa0aa398a940e1d0b0d5c9f189a6fdfadc2eb2 /drivers/scsi/bnx2i | |
| parent | c47b401230895edc94abe2c342811a2171375dbe (diff) | |
| download | op-kernel-dev-2c2255e08dee510c68d641195f83d40899897c65.zip op-kernel-dev-2c2255e08dee510c68d641195f83d40899897c65.tar.gz | |
[SCSI] bnx2i: Recouple the CFC delete cleanup with cm_abort/close completion
Specific to the Broadcom 10g chipset, the CFC delete operation must be
coupled with the cm_abort/close with does the SRC delete/terminate offload
operation prior.
Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Acked-by: Benjamin Li <benli@broadcom.com>
Reviewed-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_iscsi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c index 36b245b..0425540 100644 --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c @@ -1996,11 +1996,13 @@ int bnx2i_hw_ep_disconnect(struct bnx2i_endpoint *bnx2i_ep) else close_ret = cnic->cm_abort(bnx2i_ep->cm_sk); + /* No longer allow CFC delete if cm_close/abort fails the request */ if (close_ret) - bnx2i_ep->state = EP_STATE_DISCONN_COMPL; - - /* wait for option-2 conn teardown */ - wait_event_interruptible(bnx2i_ep->ofld_wait, + printk(KERN_ALERT "bnx2i: %s close/abort(%d) returned %d\n", + bnx2i_ep->hba->netdev->name, close, close_ret); + else + /* wait for option-2 conn teardown */ + wait_event_interruptible(bnx2i_ep->ofld_wait, bnx2i_ep->state != EP_STATE_DISCONN_START); if (signal_pending(current)) |
