Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b337e03 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

lpfc: Fix discovery issue when changing from Pt2Pt to Fabric. 



Signed-off-by: default avatarDick Kennedy <dick.kennedy@avagotech.com>
Signed-off-by: default avatarJames Smart <james.smart@avagotech.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent c84163d1

drivers/scsi/lpfc/lpfc_hbadisc.c

+11 −1
Original line number Diff line number Diff line
@@ -4834,9 +4834,19 @@ lpfc_matchdid(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	if (matchdid.un.b.id == ndlpdid.un.b.id) {

		if ((mydid.un.b.domain == matchdid.un.b.domain) &&

		    (mydid.un.b.area == matchdid.un.b.area)) {

			/* This code is supposed to match the ID

			 * for a private loop device that is

			 * connect to fl_port. But we need to

			 * check that the port did not just go

			 * from pt2pt to fabric or we could end

			 * up matching ndlp->nlp_DID 000001 to

			 * fabric DID 0x20101

			 */

			if ((ndlpdid.un.b.domain == 0) &&

			    (ndlpdid.un.b.area == 0)) {

				if (ndlpdid.un.b.id)

				if (ndlpdid.un.b.id &&

				    vport->phba->fc_topology ==

				    LPFC_TOPOLOGY_LOOP)

					return 1;

			}

			return 0;