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 98e77485812239b9ad831391ace5e782ad9f8ca0..c2ec5b812e81f23d6db8b1a94e6570f08374e113 100644 (file)
--- a/ath_rate/amrr/amrr.c
+++ b/ath_rate/amrr/amrr.c
@@ -80,6 +80,12 @@
 #define        DPRINTF(sc, _fmt, ...)
 #endif
 
+#include "release.h"
+#if 0
+static char *version = "0.1 (" RELEASE_VERSION ")";
+#endif
+static char *dev_info = "ath_rate_amrr";
+
 static int ath_rateinterval = 1000;            /* rate ctl interval (ms)  */
 static int ath_rate_max_success_threshold = 10;
 static int ath_rate_min_success_threshold = 1;
@@ -270,35 +276,41 @@ ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni)
        int srate;
 
        KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates"));
-       if (vap->iv_fixed_rate == IEEE80211_FIXED_RATE_NONE) {
+
+       if (vap->iv_fixed_rate != IEEE80211_FIXED_RATE_NONE) {
                /*
-                * No fixed rate is requested. For 11b start with
-                * the highest negotiated rate; otherwise, for 11g
-                * and 11a, we start "in the middle" at 24Mb or 36Mb.
+                * A fixed rate is to be used.  Find the corresponding
+                * index in the rate table.
                 */
-               srate = ni->ni_rates.rs_nrates - 1;
-               if (sc->sc_curmode != IEEE80211_MODE_11B) {
-                       /*
-                        * Scan the negotiated rate set to find the
-                        * closest rate.
-                        */
-                       /* NB: the rate set is assumed sorted */
-                       for (; srate >= 0 && RATE(srate) > 72; srate--);
-                       KASSERT(srate >= 0, ("bogus rate set"));
-               }
-       } else {
+               for (srate = 0; srate < ni->ni_rates.rs_nrates; srate++)
+                       if (vap->iv_fixed_rate ==
+                           (ni->ni_rates.rs_rates[srate] & IEEE80211_RATE_VAL)) {
+                               ath_rate_update(sc, ni, srate);
+                               return;
+                       }
+
+               printk(KERN_WARNING "%s: %s: fixed rate %u%sMbps is not "
+                      "available and will be ignored\n", vap->iv_dev->name,
+                      dev_info, vap->iv_fixed_rate / 2,
+                      (vap->iv_fixed_rate & 1) ? ".5" : "");
+       }
+
+       /*
+        * No fixed rate is requested. For 11b start with
+        * the highest negotiated rate; otherwise, for 11g
+        * and 11a, we start "in the middle" at 24Mb or 36Mb.
+        */
+       srate = ni->ni_rates.rs_nrates - 1;
+       if (sc->sc_curmode != IEEE80211_MODE_11B) {
                /*
-                * A fixed rate is to be used; ic_fixed_rate is an
-                * index into the supported rate set.  Convert this
-                * to the index into the negotiated rate set for
-                * the node.  We know the rate is there because the
-                * rate set is checked when the station associates.
+                * Scan the negotiated rate set to find the
+                * closest rate.
                 */
-               srate = ni->ni_rates.rs_nrates - 1;
-               for (; srate >= 0 && RATE(srate) != vap->iv_fixed_rate; srate--);
-               KASSERT(srate >= 0,
-                       ("fixed rate %d not in rate set", vap->iv_fixed_rate));
+               /* NB: the rate set is assumed sorted */
+               for (; srate >= 0 && RATE(srate) > 72; srate--);
+               KASSERT(srate >= 0, ("bogus rate set"));
        }
+
        ath_rate_update(sc, ni, srate);
 #undef RATE
 }
@@ -489,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,
@@ -498,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,
@@ -507,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,
@@ -519,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
@@ -554,12 +566,6 @@ static struct ieee80211_rate_ops ath_rate_ops = {
        .detach = ath_rate_detach,
 };
 
-#include "release.h"
-#if 0
-static char *version = "0.1 (" RELEASE_VERSION ")";
-static char *dev_info = "ath_rate_amrr";
-#endif
-
 MODULE_AUTHOR("INRIA, Mathieu Lacage");
 MODULE_DESCRIPTION("AMRR Rate control algorithm");
 #ifdef MODULE_VERSION