svn commit: r337107 - stable/11/sys/dev/mlx5/mlx5_en

[Hans Petter Selasky]

Author: hselasky
Date: Thu Aug  2 08:46:27 2018
New Revision: 337107
URL: https://svnweb.freebsd.org/changeset/base/337107

Log:
  MFC r336402:
  Do not hint about 'trust both' mode when the mlx5en(4) hardware does not support it.
  
  Sponsored by:		Mellanox Technologies

Modified:
  stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
==============================================================================
--- stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c	Thu Aug  2 08:45:32 2018	(r337106)
+++ stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c	Thu Aug  2 08:46:27 2018	(r337107)
@@ -1123,9 +1123,14 @@ mlx5e_create_ethtool(struct mlx5e_priv *priv)
 				priv, i, mlx5e_dscp_prio_handler, "CU",
 				"Set DSCP to priority mapping, 0..7");
 		}
+#define	A	"Set trust state, 1:PCP 2:DSCP"
+#define	B	" 3:BOTH"
 		SYSCTL_ADD_PROC(&priv->sysctl_ctx, SYSCTL_CHILDREN(qos_node),
 		    OID_AUTO, "trust_state", CTLTYPE_U8 | CTLFLAG_RWTUN | CTLFLAG_MPSAFE,
 		    priv, 0, mlx5e_trust_state_handler, "CU",
-		    "Set trust state, 1:PCP 2:DSCP 3:BOTH");
+		    MLX5_CAP_QCAM_FEATURE(mdev, qpts_trust_both) ?
+		    A B : A);
+#undef B
+#undef A
 	}
 }