Changeset 3314 for madwifi/trunk/net80211/ieee80211_wireless.c

Timestamp:

01/31/08 00:50:16 (4 years ago)

Author:

mtaylor

Message:

This patch adds iwpriv values for setting the
time in ms, or the number of beacons for the
beacon miss alarm. If we haven't had a beacon
in this period, the alarm is sounded and
action (i.e. roaming) is taken.

This patch changes the storage of the beacon
miss threshold to integral beacon count but
corrects the previous intent.

The default beacon miss alarm is going to be
850ms which is half way between the two hard
coded limits that were there before.

The old hard coded limits assumed that the
beacon interval was 100ms and set the limit to
10 (1000ms) for software beacon miss timer
and 7 for hardware beacon miss timer.

The new default is 850ms (the midpoint between
the two previous defaults). This value is rounded
up to the next nearest beacon interval.

There is no upper bound on the beacon miss
threshold specified, since it may need to be
wildly inflated with 25ms beacon interval, or
wildly reduced with 1000ms beacon interval.

The minimum is still 2 beacons, regardless of
the beacon interval.

Files:

• madwifi/trunk/net80211/ieee80211_wireless.c (modified) (5 diffs)

madwifi/trunk/net80211/ieee80211_wireless.c

@@ -2265 +2265 @@
-        unsigned int value = i[1];              /* NB: most values are TYPE_INT */
-        int retv = 0;
-
+, bmiss
-        const struct ieee80211_authenticator *auth;
-        const struct ieee80211_aclator *acl;
@@ -2568 +2568 @@
-                        retv = EINVAL;
-                break;
+        case IEEE80211_PARAM_BEACON_MISS_THRESH_MS:
+                if ((vap->iv_opmode != IEEE80211_M_IBSS) &&
+                    (vap->iv_opmode != IEEE80211_M_STA))
+                        return -EOPNOTSUPP;
+                /* Convert millis to TU to next highest integral # beacons */
+                bmiss = howmany(roundup(IEEE80211_MS_TO_TU(value), 
+                                ic->ic_lintval), ic->ic_lintval);
+                if (IEEE80211_BMISSTHRESH_VALID(bmiss)) {
+                        ic->ic_bmissthreshold = bmiss;
+                        retv = ENETRESET;               /* requires restart */
+                } else
+                        retv = EINVAL;
+                break;
+        case IEEE80211_PARAM_BEACON_MISS_THRESH:
+                if ((vap->iv_opmode != IEEE80211_M_IBSS) &&
+                    (vap->iv_opmode != IEEE80211_M_STA))
+                        return -EOPNOTSUPP;
+                if (IEEE80211_BMISSTHRESH_VALID(value)) {
+                        ic->ic_bmissthreshold = value;
+                        retv = ENETRESET;               /* requires restart */
+                } else
+                        retv = EINVAL;
+                break;
-        case IEEE80211_PARAM_BEACON_INTERVAL:
-                if ((vap->iv_opmode != IEEE80211_M_HOSTAP) &&
@@ -2573 +2596 @@
-                        return -EOPNOTSUPP;
-                if (IEEE80211_BINTVAL_VALID(value)) {
-
+
+
+
+
+
+
+
+
+
-                        retv = ENETRESET;               /* requires restart */
-                } else
@@ -3023 +3054 @@
-        case IEEE80211_PARAM_DTIM_PERIOD:
-                param[0] = vap->iv_dtim_period;
+                break;
+        case IEEE80211_PARAM_BEACON_MISS_THRESH_MS:
+                param[0] = IEEE80211_TU_TO_MS(
+                        vap->iv_ic->ic_bmissthreshold * vap->iv_ic->ic_lintval);
+                break;
+        case IEEE80211_PARAM_BEACON_MISS_THRESH:
+                param[0] = vap->iv_ic->ic_bmissthreshold;
-                break;
-        case IEEE80211_PARAM_BEACON_INTERVAL:
@@ -5382 +5420 @@
-        { IEEE80211_PARAM_BEACON_INTERVAL,
-          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_bintval" },
+        { IEEE80211_PARAM_BEACON_MISS_THRESH_MS,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "bmiss_ms" },
+        { IEEE80211_PARAM_BEACON_MISS_THRESH_MS,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_bmiss_ms" },
+        { IEEE80211_PARAM_BEACON_MISS_THRESH,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "bmiss" },
+        { IEEE80211_PARAM_BEACON_MISS_THRESH,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_bmiss" },
-        { IEEE80211_PARAM_DOTH,
-          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "doth" },