In the case the chip is undergoing different invasive operation which requires a chip reset, all NOPOUT request during this period must be silently dropped from queuing to the hardware. This patch will respond to libiscsi immediately with sent success. Since the request was not actually sent, the NOPIN wait timeout will get triggered and another NOPOUT request will commence through the proper channel. Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx> Acked-by: Anil Veerabhadrappa <anilgv@xxxxxxxxxxxx> --- drivers/scsi/bnx2i/bnx2i_iscsi.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c index b32baf8..507cd25 100644 --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c @@ -1068,6 +1068,22 @@ static int bnx2i_iscsi_send_generic_request(struct iscsi_task *task) char *buf; int data_len; + /* + * Forcefully terminate all in progress connection recovery at the + * earliest, either in bind(), send_pdu(LOGIN), or conn_start() + */ + if (bnx2i_adapter_ready(bnx2i_conn->ep->hba)) { + if ((task->hdr->opcode & ISCSI_OPCODE_MASK) == + ISCSI_OP_NOOP_OUT) + /* This is a WA to indicate to libiscsi that the nopout + * request was sent successfully without actually + * submitting to the hardware. + * Just silently drop the nopout request + */ + return 0; + else + return -EIO; + } bnx2i_iscsi_prep_generic_pdu_bd(bnx2i_conn); switch (task->hdr->opcode & ISCSI_OPCODE_MASK) { case ISCSI_OP_LOGIN: -- 1.7.0.5 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html