X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fklnds%2Fmxlnd%2Fmxlnd_modparams.c;h=5da8d8902c6300b939394b3760f67aef691450a8;hb=b6332b5c0dfe28d6b574e206ae651262337a8309;hp=23165d1bf0d0c5c30d5d1c24df937925db02ea7b;hpb=8c47378b057e72d6125f4baffe8721e0734d0d3f;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/mxlnd/mxlnd_modparams.c b/lnet/klnds/mxlnd/mxlnd_modparams.c
index 23165d1..5da8d89 100644
--- a/lnet/klnds/mxlnd/mxlnd_modparams.c
+++ b/lnet/klnds/mxlnd/mxlnd_modparams.c
@@ -103,127 +103,99 @@ kmx_tunables_t kmxlnd_tunables = {
 
 static char ipif_basename_space[32];
 
-#ifndef HAVE_SYSCTL_UNNUMBERED
-
-enum {
-        MXLND_N_WAITD   = 1,
-        MXLND_MAX_PEERS,
-        MXLND_CKSUM,
-        MXLND_NNTX,
-        MXLND_CREDITS,
-        MXLND_BOARD,
-        MXLND_EP_ID,
-        MXLND_IPIF_BASENAME,
-        MXLND_POLLING
-};
-#else
-
-#define MXLND_N_WAITD           CTL_UNNUMBERED
-#define MXLND_MAX_PEERS         CTL_UNNUMBERED
-#define MXLND_CKSUM             CTL_UNNUMBERED
-#define MXLND_NNTX              CTL_UNNUMBERED
-#define MXLND_CREDITS           CTL_UNNUMBERED
-#define MXLND_BOARD             CTL_UNNUMBERED
-#define MXLND_EP_ID             CTL_UNNUMBERED
-#define MXLND_IPIF_BASENAME     CTL_UNNUMBERED
-#define MXLND_POLLING           CTL_UNNUMBERED
-
-#endif
-
 static struct ctl_table kmxlnd_ctl_table[] = {
-        {
-                .ctl_name = 1,
-                .procname = "n_waitd",
-                .data     = &n_waitd,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 2,
-                .procname = "max_peers",
-                .data     = &max_peers,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 3,
-                .procname = "cksum",
-                .data     = &cksum,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 4,
-                .procname = "ntx",
-                .data     = &ntx,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 5,
-                .procname = "credits",
-                .data     = &credits,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 6,
-                .procname = "peercredits",
-                .data     = &peercredits,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 7,
-                .procname = "board",
-                .data     = &board,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 8,
-                .procname = "ep_id",
-                .data     = &ep_id,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 9,
-                .procname = "ipif_name",
-                .data     = ipif_basename_space,
-                .maxlen   = sizeof(ipif_basename_space),
-                .mode     = 0444,
-                .proc_handler = &proc_dostring
-        },
-        {
-                .ctl_name = 10,
-                .procname = "polling",
-                .data     = &polling,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {0}
+	{
+		INIT_CTL_NAME
+		.procname	= "n_waitd",
+		.data		= &n_waitd,
+		.maxlen		= sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= &proc_dointvec
+	},
+	{
+		INIT_CTL_NAME
+		.procname	= "max_peers",
+		.data		= &max_peers,
+		.maxlen		= sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= &proc_dointvec
+	},
+	{
+		INIT_CTL_NAME
+		.procname	= "cksum",
+		.data		= &cksum,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec
+	},
+	{
+		INIT_CTL_NAME
+		.procname	= "ntx",
+		.data		= &ntx,
+		.maxlen		= sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= &proc_dointvec
+	},
+	{
+		INIT_CTL_NAME
+		.procname	= "credits",
+		.data		= &credits,
+		.maxlen		= sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= &proc_dointvec
+	},
+	{
+		INIT_CTL_NAME
+		.procname	= "peercredits",
+		.data		= &peercredits,
+		.maxlen		= sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= &proc_dointvec
+	},
+	{
+		INIT_CTL_NAME
+		.procname	= "board",
+		.data		= &board,
+		.maxlen		= sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= &proc_dointvec
+	},
+	{
+		INIT_CTL_NAME
+		.procname	= "ep_id",
+		.data		= &ep_id,
+		.maxlen		= sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= &proc_dointvec
+	},
+	{
+		.procname	= "ipif_name",
+		.data		= ipif_basename_space,
+		.maxlen		= sizeof(ipif_basename_space),
+		.mode		= 0444,
+		.proc_handler	= &proc_dostring
+	},
+	{
+		INIT_CTL_NAME
+		.procname	= "polling",
+		.data		= &polling,
+		.maxlen		= sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= &proc_dointvec
+	},
+	{ 0 }
 };
 
 static struct ctl_table kmxlnd_top_ctl_table[] = {
         {
-                .ctl_name = 208,
-                .procname = "mxlnd",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0555,
-                .child    = kmxlnd_ctl_table
-        },
-        {0}
+		INIT_CTL_NAME
+		.procname	= "mxlnd",
+		.data		= NULL,
+		.maxlen		= 0,
+		.mode		= 0555,
+		.child		= kmxlnd_ctl_table
+	},
+	{ 0 }
 };
 
 void