From owner-svn-src-stable-10@freebsd.org  Wed Jul 26 11:03:15 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 405B1DB7701;
 Wed, 26 Jul 2017 11:03:15 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F11183101;
 Wed, 26 Jul 2017 11:03:14 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6QB3E1t033158;
 Wed, 26 Jul 2017 11:03:14 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6QB3EId033156;
 Wed, 26 Jul 2017 11:03:14 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201707261103.v6QB3EId033156@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 26 Jul 2017 11:03:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r321516 - stable/10/sys/dev/bxe
X-SVN-Group: stable-10
X-SVN-Commit-Author: ae
X-SVN-Commit-Paths: stable/10/sys/dev/bxe
X-SVN-Commit-Revision: 321516
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jul 2017 11:03:15 -0000

Author: ae
Date: Wed Jul 26 11:03:13 2017
New Revision: 321516
URL: https://svnweb.freebsd.org/changeset/base/321516

Log:
  MFC r321203:
    Add HPE FlexFabric 10Gb 4-port 536FLR-T device id to the bxe(4) driver.

Modified:
  stable/10/sys/dev/bxe/bxe.c
  stable/10/sys/dev/bxe/bxe.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/bxe/bxe.c
==============================================================================
--- stable/10/sys/dev/bxe/bxe.c	Wed Jul 26 07:00:27 2017	(r321515)
+++ stable/10/sys/dev/bxe/bxe.c	Wed Jul 26 11:03:13 2017	(r321516)
@@ -167,6 +167,12 @@ static struct bxe_device_type bxe_devs[] = {
         "QLogic NetXtreme II BCM57840 4x10GbE"
     },
     {
+        QLOGIC_VENDORID,
+        CHIP_NUM_57840_4_10,
+        PCI_ANY_ID, PCI_ANY_ID,
+        "QLogic NetXtreme II BCM57840 4x10GbE"
+    },
+    {
         BRCM_VENDORID,
         CHIP_NUM_57840_MF,
         PCI_ANY_ID, PCI_ANY_ID,

Modified: stable/10/sys/dev/bxe/bxe.h
==============================================================================
--- stable/10/sys/dev/bxe/bxe.h	Wed Jul 26 07:00:27 2017	(r321515)
+++ stable/10/sys/dev/bxe/bxe.h	Wed Jul 26 11:03:13 2017	(r321516)
@@ -168,6 +168,7 @@ int bxe_ilog2(int x)
 #include "ecore_sp.h"
 
 #define BRCM_VENDORID 0x14e4
+#define	QLOGIC_VENDORID	0x1077
 #define PCI_ANY_ID    (uint16_t)(~0U)
 
 struct bxe_device_type