Thanks Roman. 

Looks like my system did not had updated 5.4/queue branch,  which caused this 
hunk failure.

Martin, 

I am resending this series after rebasing on your latest 5.4/queue. 

Thanks,
Himanshu

On 9/12/19, 11:55 AM, "Roman Bolshakov" <r.bolsha...@yadro.com> wrote:

    External Email
    
    ----------------------------------------------------------------------
    On Thu, Sep 12, 2019 at 08:19:42AM -0700, Himanshu Madhani wrote:
    > From: Quinn Tran <qut...@marvell.com>
    > 
    > For N2N, the NPort ID is assigned by driver in the PLOGI ELS.
    > According to FW Spec the byte order for SID is not the same as
    > DID.
    > 
    > Signed-off-by: Quinn Tran <qut...@marvell.com>
    > Signed-off-by: Himanshu Madhani <hmadh...@marvell.com>
    > ---
    >  drivers/scsi/qla2xxx/qla_iocb.c | 7 ++++---
    >  1 file changed, 4 insertions(+), 3 deletions(-)
    > 
    > diff --git a/drivers/scsi/qla2xxx/qla_iocb.c 
b/drivers/scsi/qla2xxx/qla_iocb.c
    > index 1886de92034c..5c279449ca1c 100644
    > --- a/drivers/scsi/qla2xxx/qla_iocb.c
    > +++ b/drivers/scsi/qla2xxx/qla_iocb.c
    > @@ -2696,9 +2696,10 @@ qla24xx_els_logo_iocb(srb_t *sp, struct 
els_entry_24xx *els_iocb)
    >   els_iocb->port_id[0] = sp->fcport->d_id.b.al_pa;
    >   els_iocb->port_id[1] = sp->fcport->d_id.b.area;
    >   els_iocb->port_id[2] = sp->fcport->d_id.b.domain;
    > - els_iocb->s_id[0] = vha->d_id.b.al_pa;
    > - els_iocb->s_id[1] = vha->d_id.b.area;
    > - els_iocb->s_id[2] = vha->d_id.b.domain;
    > + /* For SID the byte order is different than DID */
    > + els_iocb->s_id[1] = vha->d_id.b.al_pa;
    > + els_iocb->s_id[2] = vha->d_id.b.area;
    > + els_iocb->s_id[0] = vha->d_id.b.domain;
    >   els_iocb->control_flags = 0;
    >  
    >   if (elsio->u.els_logo.els_cmd == ELS_DCMD_PLOGI) {
    > -- 
    > 2.12.0
    > 
    
    Hi,
    
    This one doesn't apply to 5.4/scsi-queue, the hunk lines should be:
    @@ -2656,9 +2656,10 @@
    
    Best regards,
    Roman
    

Reply via email to