Ticket #1270: beacon_interval_range-fix.patch

net80211/ieee80211_node.c

@@ -660 +660 @@
-        memcpy(ni->ni_essid, se->se_ssid + 2, ni->ni_esslen);
-        ni->ni_rstamp = se->se_rstamp;
-        ni->ni_tstamp.tsf = se->se_tstamp.tsf;
-se->se_intval
+IEEE80211_BINTVAL_SANITISE(se->se_intval)
-        ni->ni_capinfo = se->se_capinfo;
-        ni->ni_chan = se->se_chan;
-        ni->ni_timoff = se->se_timoff;
@@ -1215 +1215 @@
-                memcpy(ni->ni_essid, sp->ssid + 2, sp->ssid[1]);
-                IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3);
-                memcpy(ni->ni_tstamp.data, sp->tstamp, sizeof(ni->ni_tstamp));
-sp->bintval
+IEEE80211_BINTVAL_SANITISE(sp->bintval)
-                ni->ni_capinfo = sp->capinfo;
-                ni->ni_chan = ic->ic_curchan;
-                ni->ni_fhdwell = sp->fhdwell;

net80211/ieee80211_scan.h

@@ -130 +130 @@
-        u_int8_t bchan;
-        u_int8_t fhindex;
-        u_int8_t erp;
-8
+16
-        u_int8_t timoff;
-        u_int8_t *tim;
-        u_int8_t *tstamp;

net80211/ieee80211_wireless.c

@@ -1273 +1273 @@
-                case IW_POWER_UNICAST_R:
-                case IW_POWER_ALL_R:
-                case IW_POWER_ON:
-
-
+
+
+
+
+
+
-                        if (wrq->flags & IW_POWER_TIMEOUT)
-                                ic->ic_holdover = IEEE80211_MS_TO_TU(wrq->value);
-if (wrq->flags & IW_POWER_PERIOD)
-       ic->ic_lintval = IEEE80211_MS_TO_TU(wrq->value)
+
+ic->ic_flags |= IEEE80211_F_PMGTON
-                        break;
-                default:
-                        return -EINVAL;
@@ -2365 +2369 @@
-                if (vap->iv_opmode != IEEE80211_M_HOSTAP &&
-                    vap->iv_opmode != IEEE80211_M_IBSS)
-                        return -EINVAL;
-
-
+
-                        ic->ic_lintval = value;         /* XXX multi-bss */
-                        retv = ENETRESET;               /* requires restart */
-                } else

net80211/ieee80211_input.c

@@ -2748 +2748 @@
-                        vap->iv_stats.is_rx_chanmismatch++;
-                        return;
-                }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                /*
-                 * Count frame now that we know it's to be processed.
-                 */
@@ -2876 +2889 @@
-                                IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3);
-                                memcpy(ni->ni_tstamp.data, scan.tstamp,
-                                        sizeof(ni->ni_tstamp));
-scan.bintval
+IEEE80211_BINTVAL_SANITISE(scan.bintval)
-                                ni->ni_capinfo = scan.capinfo;
-                                ni->ni_chan = ic->ic_curchan;
-                                ni->ni_fhdwell = scan.fhdwell;
@@ -3300 +3313 @@
-                ni->ni_rssi = rssi;
-                ni->ni_rstamp = rstamp;
-                ni->ni_last_rx = jiffies;
-bintval
+IEEE80211_BINTVAL_SANITISE(bintval)
-                ni->ni_capinfo = capinfo;
-                ni->ni_chan = ic->ic_curchan;
-                ni->ni_fhdwell = vap->iv_bss->ni_fhdwell;

net80211/ieee80211_var.h

@@ -60 +60 @@
-#define IEEE80211_DTIM_MIN      1       /* min DTIM period */
-#define IEEE80211_DTIM_DEFAULT  1       /* default DTIM period */
-
-5
+10
-#define IEEE80211_BINTVAL_MIN   25      /* min beacon interval (TU's) */
-#define IEEE80211_BINTVAL_DEFAULT 100   /* default beacon interval (TU's) */
+#define IEEE80211_BINTVAL_VALID(_bi) \
+        ((IEEE80211_BINTVAL_MIN <= (_bi)) && \
+         ((_bi) <= IEEE80211_BINTVAL_MAX))
+#define IEEE80211_BINTVAL_SANITISE(_bi) \
+        (IEEE80211_BINTVAL_VALID(_bi) ? \
+         (_bi) : IEEE80211_BINTVAL_DEFAULT)
-
-#define IEEE80211_BGSCAN_INTVAL_MIN     15      /* min bg scan intvl (secs) */
-#define IEEE80211_BGSCAN_INTVAL_DEFAULT (5*60)  /* default bg scan intvl */