Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp244592ybi; Wed, 29 May 2019 20:31:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7r9913PbFUlb67Eru9gCDMBEgtBYdYLzyl3JtjzLhv+Attid8tQawJb0YcgGsIBfshYrY X-Received: by 2002:a17:902:6bc8:: with SMTP id m8mr1620542plt.227.1559187117972; Wed, 29 May 2019 20:31:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559187117; cv=none; d=google.com; s=arc-20160816; b=FmLJ3E0Ox8I0pEOL+HG+Z5ryPHZfykcYxRvhAnPJSBrnylt+dMv0ffNyTt5GGqipYS pua4PwkdPViuH8EpzUAxe688fsgd7A4BJHbOICGtm1X2GCinBSJLiK9z5jMbhbAm9TpT K1liE9oEpFgVT+0kQFekCRA9LR7C7haFJ78rr92v7mhDbBLgwnSyv59825zIHu5M7OFa gTDLVq10+JaaxaZxjz3HDztd3INfBhX0Y4RLhZwGKVpLqAFylRNERvgAmFu7chZHS2Zu eDbgJJWa8RLQdGL5TIsM6UJPSMTvZcjE+lQ9sCnio8Cv9Zlo4fZX8I4lPeo8ADgHiLx6 ipRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Z/8aOtb95/wG5ACG9HMPIwf5MA+GiJHH6VD9OcYTtTs=; b=dtCfDQFfJpSrsWyzNN3znOUGt9+lp+v1+69LtquUojS7tlU0p1ir/uGTcg9yb7QcK4 7ab0Cwbs5CkjHlnGvp8NA98sVQoXL1an3Yf90S103SDBR3DnDkyTe1ug7thItL/y5JVN VrYUipfkviLSekBh5VIvC02P686JeH406zSoyglKFIu9/Lpu9BO/EIQBHqOki1gxZOPc C8cq82LkNoUI5TTHBtrglDZDlq3GbpdMBbjt71xkqZQJG2LKHaJQBfg67UCAyFP0Q9xI oyk0fGQ1r/qhfjn1tpSLl0ALf72iHK6i5sGtqRL7Vy3m+D5tz/483gXI8VJpYPgoIZ4R yXMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gWmVStkT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o4si1853033pgp.476.2019.05.29.20.31.40; Wed, 29 May 2019 20:31:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gWmVStkT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388560AbfE3DaY (ORCPT + 99 others); Wed, 29 May 2019 23:30:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:34362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732539AbfE3DVX (ORCPT ); Wed, 29 May 2019 23:21:23 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 02D9F249BA; Thu, 30 May 2019 03:21:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186483; bh=B7VPF/oMt7zL3kPuuXld1bWvfaY8Io0vsSaCC6cL27E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gWmVStkTae6IWvDGw9YjgQfu5QDZnDK8nIXZUqklIeVBfWoyGJrcFrOwFIGjG9fDH mxRj6odPizn3Mm4cObPRtpLGoaoqM9mv457CAFVzcjVIABw/WzvgBkNOryS5RZABYP ewllpKDXRvbpqcNCwcf4ExhV1usXfkzKqRpotLmE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dick Kennedy , James Smart , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.9 121/128] scsi: lpfc: Fix FDMI manufacturer attribute value Date: Wed, 29 May 2019 20:07:33 -0700 Message-Id: <20190530030456.248152223@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030432.977908967@linuxfoundation.org> References: <20190530030432.977908967@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit d67f935b79a76ac9d86dde1a27bdd413feb5d987 ] The FDMI manufacturer value being reported on Linux is inconsistent with other OS's. Set the value to "Emulex Corporation" for consistency. Signed-off-by: Dick Kennedy Signed-off-by: James Smart Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/lpfc/lpfc_ct.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 4ac03b16d17f5..52afbcff362f9 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c @@ -1561,6 +1561,9 @@ lpfc_fdmi_hba_attr_manufacturer(struct lpfc_vport *vport, ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue; memset(ae, 0, 256); + /* This string MUST be consistent with other FC platforms + * supported by Broadcom. + */ strncpy(ae->un.AttrString, "Emulex Corporation", sizeof(ae->un.AttrString)); -- 2.20.1