lkml.org 
[lkml]   [2019]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 26/43] scsi: qla2xxx: fixup incorrect usage of host_byte
    Date
    From: Hannes Reinecke <hare@suse.com>

    [ Upstream commit 66cf50e65b183c863825f5c28a818e3f47a72e40 ]

    DRIVER_ERROR is a a driver byte setting, not a host byte. The qla2xxx
    driver should rather return DID_ERROR here to be in line with the other
    drivers.

    Link: https://lore.kernel.org/r/20191018140458.108278-1-hare@suse.de
    Signed-off-by: Hannes Reinecke <hare@suse.com>
    Acked-by: Himanshu Madhani <hmadhani@marvell.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/qla2xxx/qla_bsg.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
    index c26acde797f0d..2d5375d677367 100644
    --- a/drivers/scsi/qla2xxx/qla_bsg.c
    +++ b/drivers/scsi/qla2xxx/qla_bsg.c
    @@ -252,7 +252,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
    srb_t *sp;
    const char *type;
    int req_sg_cnt, rsp_sg_cnt;
    - int rval = (DRIVER_ERROR << 16);
    + int rval = (DID_ERROR << 16);
    uint16_t nextlid = 0;

    if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
    @@ -426,7 +426,7 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job)
    struct Scsi_Host *host = bsg_job->shost;
    scsi_qla_host_t *vha = shost_priv(host);
    struct qla_hw_data *ha = vha->hw;
    - int rval = (DRIVER_ERROR << 16);
    + int rval = (DID_ERROR << 16);
    int req_sg_cnt, rsp_sg_cnt;
    uint16_t loop_id;
    struct fc_port *fcport;
    @@ -1910,7 +1910,7 @@ qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job)
    struct Scsi_Host *host = bsg_job->shost;
    scsi_qla_host_t *vha = shost_priv(host);
    struct qla_hw_data *ha = vha->hw;
    - int rval = (DRIVER_ERROR << 16);
    + int rval = (DID_ERROR << 16);
    struct qla_mt_iocb_rqst_fx00 *piocb_rqst;
    srb_t *sp;
    int req_sg_cnt = 0, rsp_sg_cnt = 0;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-11 19:31    [W:4.843 / U:0.460 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site