From owner-svn-src-all@freebsd.org  Mon Nov  7 11:26:27 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 18F3CC3494E;
 Mon,  7 Nov 2016 11:26:27 +0000 (UTC)
 (envelope-from hselasky@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 DEDAFEC7;
 Mon,  7 Nov 2016 11:26:26 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA7BQQwl099207;
 Mon, 7 Nov 2016 11:26:26 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA7BQQBC099206;
 Mon, 7 Nov 2016 11:26:26 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201611071126.uA7BQQBC099206@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 7 Nov 2016 11:26:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308413 - head/sys/dev/mlx5/mlx5_core
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Nov 2016 11:26:27 -0000

Author: hselasky
Date: Mon Nov  7 11:26:25 2016
New Revision: 308413
URL: https://svnweb.freebsd.org/changeset/base/308413

Log:
  Query flow table capabilities according to the correct capability bit
  for infiniband.
  
  Sponsored by:	Mellanox Technologies
  MFC after:	1 week

Modified:
  head/sys/dev/mlx5/mlx5_core/mlx5_fw.c

Modified: head/sys/dev/mlx5/mlx5_core/mlx5_fw.c
==============================================================================
--- head/sys/dev/mlx5/mlx5_core/mlx5_fw.c	Mon Nov  7 11:22:50 2016	(r308412)
+++ head/sys/dev/mlx5/mlx5_core/mlx5_fw.c	Mon Nov  7 11:26:25 2016	(r308413)
@@ -167,7 +167,11 @@ int mlx5_query_hca_caps(struct mlx5_core
 			return err;
 	}
 
-	if (MLX5_CAP_GEN(dev, nic_flow_table)) {
+	if ((MLX5_CAP_GEN(dev, port_type) ==
+	    MLX5_CMD_HCA_CAP_PORT_TYPE_ETHERNET &&
+	    MLX5_CAP_GEN(dev, nic_flow_table)) ||
+	    (MLX5_CAP_GEN(dev, port_type) == MLX5_CMD_HCA_CAP_PORT_TYPE_IB &&
+	    MLX5_CAP_GEN(dev, ipoib_enhanced_offloads))) {
 		err = mlx5_core_get_caps(dev, MLX5_CAP_FLOW_TABLE,
 					 HCA_CAP_OPMOD_GET_CUR);
 		if (err)