Merge r7457 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7710 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 04:35:03 +00:00
parent be07c06dc5
commit 8981505eac
2 changed files with 2 additions and 4 deletions

View File

@@ -987,8 +987,7 @@ qla24xx_reset_risc(scsi_qla_host_t *vha)
if (++abts_cnt < 5) {
set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
set_bit(MPI_RESET_NEEDED, &vha->dpc_flags);
}
else {
} else {
/*
* We exhausted the ISP abort retries. We have to
* set the board offline.

View File

@@ -1252,8 +1252,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
}
ql_dump_buffer(ql_dbg_user + ql_dbg_buffer, vha, 0x5056,
(uint8_t *)pkt, sizeof(*pkt));
}
else {
} else {
#ifndef NEW_LIBFC_API
bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
#else