From 32f01bfd40d865df8a817f26bec51fb3d793ad3f Mon Sep 17 00:00:00 2001 From: Manish Rangankar Date: Mon, 23 Apr 2012 22:32:33 -0700 Subject: [PATCH] --- yaml --- r: 309657 b: refs/heads/master c: 3d948e2a21ed8641a84ad437d2544b215d747916 h: refs/heads/master i: 309655: af8d126e11d13c7fc05bfd2a78b032e056d2876d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_init.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 74a72d85ddc9..a06e69fe5a7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f50aa3ad54f3d029026d437f43324ce336dd8f5 +refs/heads/master: 3d948e2a21ed8641a84ad437d2544b215d747916 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_init.c b/trunk/drivers/scsi/qla4xxx/ql4_init.c index 90ee5d8fa731..05484364010e 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_init.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_init.c @@ -884,8 +884,8 @@ int qla4xxx_ddb_change(struct scsi_qla_host *ha, uint32_t fw_ddb_index, switch (state) { case DDB_DS_SESSION_ACTIVE: case DDB_DS_DISCOVERY: - ddb_entry->unblock_sess(ddb_entry->sess); qla4xxx_update_session_conn_param(ha, ddb_entry); + ddb_entry->unblock_sess(ddb_entry->sess); status = QLA_SUCCESS; break; case DDB_DS_SESSION_FAILED: @@ -897,6 +897,7 @@ int qla4xxx_ddb_change(struct scsi_qla_host *ha, uint32_t fw_ddb_index, } break; case DDB_DS_SESSION_ACTIVE: + case DDB_DS_DISCOVERY: switch (state) { case DDB_DS_SESSION_FAILED: /*