On 03/07/2018 07:49 PM, Himanshu Madhani wrote: > Commit 7d64c39e64310 fixed regression of FCP discovery when > Nport Handle is in-use and relogin is triggered. However, > during FCP and FC-NVMe discovery this resulted into only > discovering NVMe LUNs. > > This patch fixes issue where FCP and FC-NVMe protocol is used on > same port where assigning FC_NO_LOOP_ID will result into discovery > failure for FCP LUNs. > > Fixes: a084fd68e1d26 ("scsi: qla2xxx: Fix re-login for Nport Handle in use") > Signed-off-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx> > --- > Hi Martin, > > This patch fixes the FCP discovery on same port with FC-NVMe enabled. > > Please apply to 4.16/scsi-fixes at your earliest convenience. > > Thanks, > Himanshu > --- > drivers/scsi/qla2xxx/qla_init.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c > index c4b04e807e12..cb182b102bfd 100644 > --- a/drivers/scsi/qla2xxx/qla_init.c > +++ b/drivers/scsi/qla2xxx/qla_init.c > @@ -1719,7 +1719,6 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) > > set_bit(ea->fcport->loop_id, vha->hw->loop_id_map); > spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags); > - ea->fcport->loop_id = FC_NO_LOOP_ID; > ea->fcport->chip_reset = vha->hw->base_qpair->chip_reset; > ea->fcport->logout_on_delete = 1; > ea->fcport->send_els_logo = 0; > Reviewed-by: Hannes Reinecke <hare@xxxxxxxx> Cheers, Hannes -- Dr. Hannes Reinecke Teamlead Storage & Networking hare@xxxxxxx +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg)