Ticket #848: madwifi-sta-discs.patch

ath/if_ath.c

@@ -264 +264 @@
-static int outdoor = -1;
-static int xchanmode = -1;
-
+static int bmiss_thresh = -1;
+static int beacon_sleep = -1;
+
-static const char *hal_status_desc[] = {
-        "No error",
-        "No hardware present or device not yet supported",
@@ -294 +297 @@
-MODULE_PARM(rfkill, "i");
-MODULE_PARM(autocreate, "s");
-MODULE_PARM(ratectl, "s");
+MODULE_PARAM(bmiss_thresh, "i");
+MODULE_PARAM(beacon_sleep, "i");
-#else
-#include <linux/moduleparam.h>
-module_param(countrycode, int, 0600);
@@ -302 +307 @@
-module_param(rfkill, int, 0600);
-module_param(autocreate, charp, 0600);
-module_param(ratectl, charp, 0600);
+module_param(bmiss_thresh, int, 0600);
+module_param(beacon_sleep, int, 0600);
-#endif
-MODULE_PARM_DESC(countrycode, "Override default country code");
-MODULE_PARM_DESC(outdoor, "Enable/disable outdoor use");
@@ -309 +316 @@
-MODULE_PARM_DESC(rfkill, "Enable/disable RFKILL capability");
-MODULE_PARM_DESC(autocreate, "Create ath device in [sta|ap|wds|adhoc|ahdemo|monitor] mode. defaults to sta, use 'none' to disable");
-MODULE_PARM_DESC(ratectl, "Rate control algorithm [amrr|onoe|sample], defaults to '" DEF_RATE_CTL "'");
+MODULE_PARM_DESC(bmiss_thresh, "Override beacon miss threshold");
+MODULE_PARM_DESC(beacon_sleep, "Override beacon sleep duration");
-
-static int      ath_debug = 0;
-#ifdef AR_DEBUG
@@ -4514 +4523 @@
-                 * is specified in TU so we only need calculate based
-                 * on the beacon interval.  Note that we clamp the
-                 * result to at most 10 beacons.
+                 *
+                 * Pepper: added module parameter control of bmissthreshold.
+                 * If param *is* specified, don't clamp values.
-                 */
-
-
-
-
-
+
+
+
+
+
+
-
+                } else {
+                        bs.bs_bmissthreshold = howmany(ic->ic_bmisstimeout, intval);
+
+                        if (bs.bs_bmissthreshold > 10)
+                                bs.bs_bmissthreshold = 10;
+                        else if (bs.bs_bmissthreshold <= 0)
+                                bs.bs_bmissthreshold = 1;
+                }
+
-                /*
-                 * Calculate sleep duration.  The configuration is
-                 * given in ms.  We ensure a multiple of the beacon
@@ -4529 +4551 @@
-                 * to make it a multiple of that.
-                 *
-                 * XXX fixed at 100ms
+                 * Pepper: added module param control of sleepduration.
-                 */
-
-
-
-
+
+
+
+
+
+
+
+
-
-                DPRINTF(sc, ATH_DEBUG_BEACON, 
-                        "%s: tsf %llu tsf:tu %u intval %u nexttbtt %u dtim %u nextdtim %u bmiss %u sleep %u cfp:period %u maxdur %u next %u timoffset %u\n"
@@ -4553 +4580 @@
-
-                ath_hal_intrset(ah, 0);
-                ath_hal_beacontimers(ah, &bs);
-
+
+
+
+
+
-                ath_hal_intrset(ah, sc->sc_imask);
-        } else {
-                ath_hal_intrset(ah, 0);