mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 18:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-05-05 18:47:35 -07:00
parent 71948beae4 0ed0d35395
commit b58ab63d11
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qla2x00t-32gbit/qla_init.c
View File

@@ -465,7 +465,7 @@ void qla24xx_handle_adisc_event(scsi_qla_host_t *vha, struct event_arg *ea)
fcport->fw_login_state, ea->rc, fcport->login_gen, ea->sp->gen2,
fcport->rscn_gen, ea->sp->gen1, fcport->loop_id);
if (ea->data[0] != MBS_COMMAND_COMPLETE) {
if (ea->rc != (MBS_COMMAND_COMPLETE & MBS_MASK)) {
ql_dbg(ql_dbg_disc, vha, 0x2066,
"%s %s: adisc fail: post delete\n",
__func__, wwn_to_str(ea->fcport->port_name));
@@ -1884,7 +1884,7 @@ qla24xx_async_abort_command(srb_t *sp)
static void
qla24xx_handle_prli_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
{
switch (ea->data[0]) {
switch (ea->rc | MBS_COMMAND_COMPLETE) {
case MBS_COMMAND_COMPLETE:
ql_dbg(ql_dbg_disc, vha, 0x2118, "%s %d %s post gpdb\n",
__func__, __LINE__, wwn_to_str(ea->fcport->port_name));
@@ -1965,7 +1965,7 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
return;
}
switch (ea->data[0]) {
switch (ea->rc | MBS_COMMAND_COMPLETE) {
case MBS_COMMAND_COMPLETE:
/*
* Driver must validate login state - If PRLI not complete,

6
qla2x00t-32gbit/qla_target.c
View File

@@ -213,16 +213,14 @@ struct scsi_qla_host *qlt_find_host_by_d_id(struct scsi_qla_host *vha,
be_id_t d_id)
{
struct scsi_qla_host *host;
uint32_t key = 0;
uint32_t key;
if (vha->d_id.b.area == d_id.area &&
vha->d_id.b.domain == d_id.domain &&
vha->d_id.b.al_pa == d_id.al_pa)
return vha;
key = d_id.domain << 16;
key |= d_id.area << 8;
key |= d_id.al_pa;
key = be_to_port_id(d_id).b24;
host = btree_lookup32(&vha->hw->tgt.host_map, key);
if (!host)