Commit 2c2255e0 authored Aug 12, 2010 by Eddie Wai Committed by James Bottomley Sep 05, 2010

[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>

parent c47b4012

drivers/scsi/bnx2i/bnx2i_iscsi.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -1996,9 +1996,11 @@ 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;

		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);