svn commit: r341932 - in stable/12/sys/dev/mlx5: mlx5_core mlx5_en

[Hans Petter Selasky]

Author: hselasky
Date: Wed Dec 12 12:19:49 2018
New Revision: 341932
URL: https://svnweb.freebsd.org/changeset/base/341932

Log:
  MFC r341559 and r341645:
  mlx5: Move hw.mlx5 node definition to mlx5_core.
  
  Submitted by:   kib@
  Sponsored by:   Mellanox Technologies

Modified:
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_core.h
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
  stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_core.h
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_core.h	Wed Dec 12 12:19:49 2018	(r341931)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_core.h	Wed Dec 12 12:19:49 2018	(r341932)
@@ -103,4 +103,6 @@ struct mlx5_crspace_regmap {
 
 extern struct pci_driver mlx5_core_driver;
 
+SYSCTL_DECL(_hw_mlx5);
+
 #endif /* __MLX5_CORE_H__ */

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c	Wed Dec 12 12:19:49 2018	(r341931)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c	Wed Dec 12 12:19:49 2018	(r341932)
@@ -61,6 +61,8 @@ static int prof_sel = MLX5_DEFAULT_PROF;
 module_param_named(prof_sel, prof_sel, int, 0444);
 MODULE_PARM_DESC(prof_sel, "profile selector. Valid range 0 - 2");
 
+SYSCTL_NODE(_hw, OID_AUTO, mlx5, CTLFLAG_RW, 0, "mlx5 HW controls");
+
 #define NUMA_NO_NODE       -1
 
 static LIST_HEAD(intf_list);

Modified: stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c	Wed Dec 12 12:19:49 2018	(r341931)
+++ stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c	Wed Dec 12 12:19:49 2018	(r341932)
@@ -159,8 +159,6 @@ static const struct {
 
 MALLOC_DEFINE(M_MLX5EN, "MLX5EN", "MLX5 Ethernet");
 
-static SYSCTL_NODE(_hw, OID_AUTO, mlx5, CTLFLAG_RW, 0, "MLX5 driver parameters");
-
 static void
 mlx5e_update_carrier(struct mlx5e_priv *priv)
 {