lkml.org 
[lkml]   [2021]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 11/35] scsi: qla2xxx: Fix broken #endif placement
    Date
    From: Alexey Dobriyan <adobriyan@gmail.com>

    [ Upstream commit 5999b9e5b1f8a2f5417b755130919b3ac96f5550 ]

    Only half of the file is under include guard because terminating #endif
    is placed too early.

    Link: https://lore.kernel.org/r/YE4snvoW1SuwcXAn@localhost.localdomain
    Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/qla2xxx/qla_target.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
    index 07ea4fcf4f88..983ec09da650 100644
    --- a/drivers/scsi/qla2xxx/qla_target.h
    +++ b/drivers/scsi/qla2xxx/qla_target.h
    @@ -112,7 +112,6 @@
    (min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \
    QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0))
    #endif
    -#endif

    #define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha)) \
    ? le16_to_cpu((iocb)->u.isp2x.target.extended) \
    @@ -323,6 +322,7 @@ struct ctio_to_2xxx {
    #ifndef CTIO_RET_TYPE
    #define CTIO_RET_TYPE 0x17 /* CTIO return entry */
    #define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */
    +#endif

    struct fcp_hdr {
    uint8_t r_ctl;
    --
    2.30.1


    \
     
     \ /
      Last update: 2021-04-05 11:10    [W:3.573 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site