Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp260491ybi; Wed, 29 May 2019 20:52:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqz0v1TMgtTxXoT7mgYhHXbBKQpy+xb2hS7d/lM8CPtSlq7qORua2dH5PCHB7RBeQ8XIWHbh X-Received: by 2002:a62:29c7:: with SMTP id p190mr1599938pfp.218.1559188346689; Wed, 29 May 2019 20:52:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559188346; cv=none; d=google.com; s=arc-20160816; b=OeWpFXEvedQVhZWtAsVfSu/5InPr3VL/oHG7LeDM/W92sIh56U6NzL294W6aUEuoaW 0fhIGU89K7H9ru2Hu1ye2y9I8CHognnCwCn31SA6vC++Q5+h5Q2P1IvGgwZKVc0kPR9g s1VNyL95QZg1SfGAOxtzkrjcaHIiBVOqOJp3K31Kmh5E3aD8mlywvkDE8qE7xjRAmg5V 4hcOlV6eQ7akx/Z+ifp3+1XiveO7MdpvVfMfkm1zmo2r+06utDkwcL8J+76Dr4T/pwkE h7STytahrHG7bTBs6zhqIkKCLZj6NEGEdKry2lAMUIKvinhxF7q0tT8F69Wy30pRcKQT JlFQ== 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=ymSwU0tKhIhrGiCK04gL3aJn25kg4nAVXYsBdYOUn7c=; b=NfKV3/Mf0cb4yGF2JFcHTGPw1ufoKc5Q08PDY16dVXRuF0MLizKP4MTb0z+0qZOsQo AAugKnHPiLpZRKN7WnupWjC9w/YlKhyI4Gj8aYODCjuHrgfvODbFkpQqmQt4vhW/4sVJ MOZ+m52yJrdmNojHM24oeK/DQzQR5lsg+Iq6VQXbmaQ8kVtTRo09k/iAQmKrp70BiBjJ e3rBbtHlRDQSzgFWnfVqT9e0rFzU8AxNCubiqVwd8YAw+X4wttnlZDZULPzqBPff8DtL uv94jKZAmoZqEcDfLauzChFGjt3djwHwxZ2JWmc+LX0QV53j9LS16GbP+8xMNTPSqI5n m7bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=btIqwCtY; 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 h3si1560495pjs.104.2019.05.29.20.52.09; Wed, 29 May 2019 20:52:26 -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=btIqwCtY; 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 S1732760AbfE3DuJ (ORCPT + 99 others); Wed, 29 May 2019 23:50:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:57574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732104AbfE3DUA (ORCPT ); Wed, 29 May 2019 23:20:00 -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 0D62724908; Thu, 30 May 2019 03:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186400; bh=RLTiq+lGe/TONivcXAkemCu/n92aFFinOfBl5ExwX0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=btIqwCtYGUA7ljFpiCWVssBX6iOXUSAPs1glgJtEZ0uUYL4RkOe9rN6EiWcZMMpjq A6LiDTkD9VIt8Ow1MhlstK7nwcx4aUeWFYAfjBBeKsBSoXsXt40FKJB7pLu9GRk16U Jjay+IAcBWYsrDXaHgjIYivAcB88EYZS/xNpgTwo= 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.14 182/193] scsi: lpfc: Fix FDMI manufacturer attribute value Date: Wed, 29 May 2019 20:07:16 -0700 Message-Id: <20190530030512.819414438@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030446.953835040@linuxfoundation.org> References: <20190530030446.953835040@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 126723a5bc6f6..54664a07d92ec 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c @@ -1734,6 +1734,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