Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Nov 2016 08:58:12 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r308683 - stable/10/sys/dev/mlx5/mlx5_core
Message-ID:  <201611150858.uAF8wC5s066198@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Tue Nov 15 08:58:12 2016
New Revision: 308683
URL: https://svnweb.freebsd.org/changeset/base/308683

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

Modified:
  stable/10/sys/dev/mlx5/mlx5_core/mlx5_fw.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/mlx5/mlx5_core/mlx5_fw.c
==============================================================================
--- stable/10/sys/dev/mlx5/mlx5_core/mlx5_fw.c	Tue Nov 15 08:57:36 2016	(r308682)
+++ stable/10/sys/dev/mlx5/mlx5_core/mlx5_fw.c	Tue Nov 15 08:58:12 2016	(r308683)
@@ -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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611150858.uAF8wC5s066198>