Don't set ctl_name in Linux 2.6.33+, it was removed

[madwifi/.git] / ath_rate / amrr / amrr.c

diff --git a/ath_rate/amrr/amrr.c b/ath_rate/amrr/amrr.c
index 930aeab80aed26a29abf44877e98ed4864a0b452..c2ec5b812e81f23d6db8b1a94e6570f08374e113 100644 (file)
--- a/ath_rate/amrr/amrr.c
+++ b/ath_rate/amrr/amrr.c
@@ -501,7 +501,7 @@ static int min_threshold = 1;
  */
 
 static ctl_table ath_rate_static_sysctls[] = {
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "interval",
          .mode         = 0644,
          .data         = &ath_rateinterval,
@@ -510,7 +510,7 @@ static ctl_table ath_rate_static_sysctls[] = {
          .extra2       = &maxint,
          .proc_handler = proc_dointvec_minmax
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "max_success_threshold",
          .mode         = 0644,
          .data         = &ath_rate_max_success_threshold,
@@ -519,7 +519,7 @@ static ctl_table ath_rate_static_sysctls[] = {
          .extra2       = &maxint,
          .proc_handler = proc_dointvec_minmax
        },
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "min_success_threshold",
          .mode         = 0644,
          .data         = &ath_rate_min_success_threshold,
@@ -531,21 +531,21 @@ static ctl_table ath_rate_static_sysctls[] = {
        { 0 }
 };
 static ctl_table ath_rate_table[] = {
-       { .ctl_name     = CTL_AUTO,
+       { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "rate_amrr",
          .mode         = 0555,
          .child        = ath_rate_static_sysctls
        }, { 0 }
 };
 static ctl_table ath_ath_table[] = {
-       { .ctl_name     = DEV_ATH,
+       { ATH_INIT_CTL_NAME(DEV_ATH)
          .procname     = "ath",
          .mode         = 0555,
          .child        = ath_rate_table
        }, { 0 }
 };
 static ctl_table ath_root_table[] = {
-       { .ctl_name     = CTL_DEV,
+       { ATH_INIT_CTL_NAME(CTL_DEV)
          .procname     = "dev",
          .mode         = 0555,
          .child        = ath_ath_table