From: Dick Kennedy Date: Wed, 23 Aug 2017 23:55:40 +0000 (-0700) Subject: scsi: lpfc: Correct issues with FAWWN and FDISCs X-Git-Tag: v4.1.12-124.31.3~1007 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7dc0c436f139e96dcaf0afca722166dcaf34d8dc;p=users%2Fjedix%2Flinux-maple.git scsi: lpfc: Correct issues with FAWWN and FDISCs Orabug: 27631736 When using fabric-assigned WWNs, the switch doesn't like copy of the FLOGI payload, which includes valid VVL bits, to be used as the FDISC payload. Rather than wait for corrected switch firmware, ensure the VVL bits are marked invalid on FDISCs. [mkp: typo] Signed-off-by: Dick Kennedy Signed-off-by: James Smart Signed-off-by: Martin K. Petersen (cherry picked from commit 176de5bb20271089d2ab120bb7737b66acc3c000) Signed-off-by: Dick dkennedy Conflicts: drivers/scsi/lpfc/lpfc_els.c The vendorVerison is defined in a union with some nvme structs, I omitted taking the nvme code. Signed-off-by: Dan Duval Reviewed-by: Jack Vogel --- diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index c56f9298215a..ffe7c77b58d8 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c @@ -8593,6 +8593,7 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, pcmd += sizeof(uint32_t); /* Node Name */ pcmd += sizeof(uint32_t); /* Node Name */ memcpy(pcmd, &vport->fc_nodename, 8); + sp->cmn.valid_vendor_ver_level = 0; memset(sp->vendorVersion, 0, sizeof(sp->vendorVersion)); lpfc_set_disctmo(vport);