Changeset 2725

Timestamp:

10/05/07 07:58:04 (1 year ago)

Author:

mtaylor

Message:

merged from trunk r2724

Files:

• madwifi/branches/madwifi-dfs/net80211/ieee80211_scan_ap.c (modified) (32 diffs)
• madwifi/branches/madwifi-dfs/net80211/ieee80211_wireless.c (modified) (1 diff)

madwifi/branches/madwifi-dfs/net80211/ieee80211_scan_ap.c

@@ -53 +53 @@
-#include <net80211/ieee80211_var.h>
-
+#define AP_PURGE_SCANS  2               /* age for purging entries (scans) */
+#define RSSI_LPF_LEN    10
+#define RSSI_EP_MULTIPLIER      (1<<7)  /* pow2 to optimize out * and / */
+#define RSSI_IN(x)              ((x) * RSSI_EP_MULTIPLIER)
+#define LPF_RSSI(x, y, len)     (((x) * ((len) - 1) + (y)) / (len))
+#define RSSI_LPF(x, y) do {                                             \
+        if ((y) >= -20)                                                 \
+                x = LPF_RSSI((x), RSSI_IN((y)), RSSI_LPF_LEN);                  \
+} while (0)
+#define EP_RND(x, mul) \
+        ((((x)%(mul)) >= ((mul)/2)) ? howmany(x, mul) : (x)/(mul))
+#define RSSI_GET(x)     EP_RND(x, RSSI_EP_MULTIPLIER)
+#define AP_HASHSIZE     32
+/* simple hash is enough for variation of macaddr */
+#define AP_HASH(addr)   \
+        (((const u_int8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % AP_HASHSIZE)
+#define SCAN_AP_LOCK_INIT(_st, _name)                                   \
+        spin_lock_init(&(_st)->as_lock)
+#define SCAN_AP_LOCK_DESTROY(_st)
+#define SCAN_AP_LOCK_IRQ(_st) do {                                      \
+        unsigned long __stlockflags;                                    \
+        spin_lock_irqsave(&(_st)->as_lock, __stlockflags);
+#define SCAN_AP_UNLOCK_IRQ(_st)                                         \
+        spin_unlock_irqrestore(&(_st)->as_lock, __stlockflags);         \
+} while (0)
+#define SCAN_AP_UNLOCK_IRQ_EARLY(_st)                                   \
+        spin_unlock_irqrestore(&(_st)->as_lock, __stlockflags);
+
+#define SCAN_AP_GEN_LOCK_INIT(_st, _name)                               \
+        spin_lock_init(&(_st)->as_scanlock)
+#define SCAN_AP_GEN_LOCK_DESTROY(_st)
+#define SCAN_AP_GEN_LOCK(_st)           spin_lock(&(_st)->as_scanlock);
+#define SCAN_AP_GEN_UNLOCK(_st) spin_unlock(&(_st)->as_scanlock);
+
+struct scan_entry {
+        struct ieee80211_scan_entry base;
+        TAILQ_ENTRY(scan_entry) se_list;
+        LIST_ENTRY(scan_entry) se_hash;
+        u_int8_t        se_seen;                /* seen during current scan */
+        u_int8_t        se_notseen;             /* not seen in previous scans */
+        u_int32_t se_avgrssi;           /* LPF rssi state */
+        unsigned long se_lastupdate;    /* time of last update */
+        unsigned long se_lastfail;      /* time of last failure */
+        unsigned long se_lastassoc;     /* time of last association */
+        u_int se_scangen;               /* iterator scan gen# */
+};
+
-struct ap_state {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        struct IEEE80211_TQ_STRUCT as_actiontq; /* tasklet for "action" */
-        struct ieee80211_scan_entry as_selbss;  /* selected bss for action tasklet */
@@ -62 +121 @@
-static int ap_flush(struct ieee80211_scan_state *);
-static void action_tasklet(IEEE80211_TQUEUE_ARG);
+static struct ieee80211_channel *find11gchannel(struct ieee80211com *ic, int i, int freq);
+
+static const u_int chanflags[] = {
+        IEEE80211_CHAN_B,       /* IEEE80211_MODE_AUTO */
+        IEEE80211_CHAN_A,       /* IEEE80211_MODE_11A */
+        IEEE80211_CHAN_B,       /* IEEE80211_MODE_11B */
+        IEEE80211_CHAN_PUREG,   /* IEEE80211_MODE_11G */
+        IEEE80211_CHAN_FHSS,    /* IEEE80211_MODE_FH */
+        IEEE80211_CHAN_A,       /* IEEE80211_MODE_TURBO_A */ /* for turbo mode look for AP in normal channel */
+        IEEE80211_CHAN_PUREG,   /* IEEE80211_MODE_TURBO_G */
+        IEEE80211_CHAN_ST,      /* IEEE80211_MODE_TURBO_STATIC_A */
+};
+
+static const u_int16_t rcl1[] =         /* 8 FCC channel: 52, 56, 60, 64, 36, 40, 44, 48 */
+{ 5260, 5280, 5300, 5320, 5180, 5200, 5220, 5240 };
+static const u_int16_t rcl2[] =         /* 4 MKK channels: 34, 38, 42, 46 */
+{ 5170, 5190, 5210, 5230 };
+static const u_int16_t rcl3[] =         /* 2.4Ghz ch: 1,6,11,7,13 */
+{ 2412, 2437, 2462, 2442, 2472 };
+static const u_int16_t rcl4[] =         /* 5 FCC channel: 149, 153, 161, 165 */
+{ 5745, 5765, 5785, 5805, 5825 };
+static const u_int16_t rcl7[] =         /* 11 ETSI channel: 100,104,108,112,116,120,124,128,132,136,140 */
+{ 5500, 5520, 5540, 5560, 5580, 5600, 5620, 5640, 5660, 5680, 5700 };
+static const u_int16_t rcl8[] =         /* 2.4Ghz ch: 2,3,4,5,8,9,10,12 */
+{ 2417, 2422, 2427, 2432, 2447, 2452, 2457, 2467 };
+static const u_int16_t rcl9[] =         /* 2.4Ghz ch: 14 */
+{ 2484 };
+static const u_int16_t rcl10[] =        /* Added Korean channels 2312-2372 */
+{ 2312, 2317, 2322, 2327, 2332, 2337, 2342, 2347, 2352, 2357, 2362, 2367, 2372 };
+static const u_int16_t rcl11[] =        /* Added Japan channels in 4.9/5.0 spectrum */
+{ 5040, 5060, 5080, 4920, 4940, 4960, 4980 };
+#ifdef ATH_TURBO_SCAN
+static const u_int16_t rcl5[] =         /* 3 static turbo channels */
+{ 5210, 5250, 5290 };
+static const u_int16_t rcl6[] =         /* 2 static turbo channels */
+{ 5760, 5800 };
+static const u_int16_t rcl6x[] =                /* 4 FCC3 turbo channels */
+{ 5540, 5580, 5620, 5660 };
+static const u_int16_t rcl12[] =                /* 2.4Ghz Turbo channel 6 */
+{ 2437 };
+static const u_int16_t rcl13[] =                /* dynamic Turbo channels */
+{ 5200, 5240, 5280, 5765, 5805 };
+#endif /* ATH_TURBO_SCAN */
+
+struct scanlist {
+        u_int16_t       mode;
+        u_int16_t       count;
+        const u_int16_t *list;
+};
+
+#define IEEE80211_MODE_TURBO_STATIC_A   IEEE80211_MODE_MAX
+#define X(a)    .count = sizeof(a)/sizeof(a[0]), .list = a
+
+static const struct scanlist staScanTable[] = {
+        { IEEE80211_MODE_11B,                   X(rcl3) },
+        { IEEE80211_MODE_11A,                   X(rcl1) },
+        { IEEE80211_MODE_11A,                   X(rcl2) },
+        { IEEE80211_MODE_11B,                   X(rcl8) },
+        { IEEE80211_MODE_11B,                   X(rcl9) },
+        { IEEE80211_MODE_11A,                   X(rcl4) },
+#ifdef ATH_TURBO_SCAN
+        { IEEE80211_MODE_TURBO_STATIC_A,        X(rcl5) },
+        { IEEE80211_MODE_TURBO_STATIC_A,        X(rcl6) },
+        { IEEE80211_MODE_TURBO_A,               X(rcl6x) },
+        { IEEE80211_MODE_TURBO_A,               X(rcl13) },
+#endif /* ATH_TURBO_SCAN */
+        { IEEE80211_MODE_11A,                   X(rcl7) },
+        { IEEE80211_MODE_11B,                   X(rcl10) },
+        { IEEE80211_MODE_11A,                   X(rcl11) },
+#ifdef ATH_TURBO_SCAN
+        { IEEE80211_MODE_TURBO_G,               X(rcl12) },
+#endif /* ATH_TURBO_SCAN */
+        { .list = NULL }
+};
+
+#undef X
+/* This function must be invoked with locks acquired */
+static void
+add_channels(struct ieee80211com *ic,
+        struct ieee80211_scan_state *ss,
+        enum ieee80211_phymode mode, const u_int16_t freq[], int nfreq)
+{
+#define N(a)    (sizeof(a) / sizeof(a[0]))
+        struct ieee80211_channel *c, *cg;
+        u_int modeflags;
+        int i;
+
+        KASSERT(mode < N(chanflags), ("Unexpected mode %u", mode));
+        modeflags = chanflags[mode];
+        for (i = 0; i < nfreq; i++) {
+                c = ieee80211_find_channel(ic, freq[i], modeflags);
+                if (c == NULL || isclr(ic->ic_chan_active, c->ic_ieee))
+                        continue;
+                if (mode == IEEE80211_MODE_AUTO) {
+                        /*
+                         * XXX special-case 11b/g channels so we select
+                         *     the g channel if both are present.
+                         */
+                        if (IEEE80211_IS_CHAN_B(c) &&
+                            (cg = find11gchannel(ic, i, c->ic_freq)) != NULL)
+                                c = cg;
+                }
+                if (ss->ss_last >= IEEE80211_SCAN_MAX)
+                        break;
+                ss->ss_chans[ss->ss_last++] = c;
+        }
+#undef N
+}
+
+/* This function must be invoked with locks acquired */
+static int
+checktable(const struct scanlist *scan, const struct ieee80211_channel *c)
+{
+        int i;
+
+        for (; scan->list != NULL; scan++) {
+                for (i = 0; i < scan->count; i++)
+                        if (scan->list[i] == c->ic_freq)
+                                return 1;
+        }
+        return 0;
+}
-
-/*
@@ -74 +255 @@
-
-        MALLOC(as, struct ap_state *, sizeof(struct ap_state),
-
+
+
+
+
+
+
+
-        ss->ss_priv = as;
-        IEEE80211_INIT_TQUEUE(&as->as_actiontq, action_tasklet, ss);
-        ap_flush(ss);
-        return 1;
@@ -89 +275 @@
-        struct ap_state *as = ss->ss_priv;
-
-
-
+
+
+
+
+
-
-        _MOD_DEC_USE(THIS_MODULE);
@@ -103 +292 @@
-{
-        struct ap_state *as = ss->ss_priv;
-
+
+
+
-        memset(as->as_maxrssi, 0, sizeof(as->as_maxrssi));
+        TAILQ_FOREACH_SAFE(se, &as->as_entry, se_list, next) {
+                TAILQ_REMOVE(&as->as_entry, se, se_list);
+                LIST_REMOVE(se, se_hash);
+                FREE(se, M_80211_SCAN);
+        }
-        ss->ss_last = 0;                /* ensure no channel will be picked */
+        SCAN_AP_UNLOCK_IRQ(as);
-        return 0;
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-find11gchannel(struct ieee80211com *ic, int i, int freq)
-{
-const 
+
-        int j;
-
@@ -123 +331 @@
-                c = &ic->ic_channels[j];
-                if (c->ic_freq == freq && IEEE80211_IS_CHAN_ANYG(c))
-1
+c
-        }
-        for (j = 0; j < i; j++) {
-                c = &ic->ic_channels[j];
-                if (c->ic_freq == freq && IEEE80211_IS_CHAN_ANYG(c))
-1
-
-0
+c
+
+NULL
-}
-
@@ -139 +347 @@
-ap_start(struct ieee80211_scan_state *ss, struct ieee80211vap *vap)
-{
-
-
+
+
+
+
-        int i;
+        unsigned int mode = 0;
+
+        SCAN_AP_LOCK_IRQ(as);
+        ic = vap->iv_ic;
+        /* Determine mode flags to match, or leave zero for auto mode */
+        as->as_vap_desired_mode = vap->iv_des_mode;
+        as->as_required_mode    = 0;
+        if (as->as_vap_desired_mode != IEEE80211_MODE_AUTO) {
+                as->as_required_mode = chanflags[as->as_vap_desired_mode];
+                if (vap->iv_ath_cap & IEEE80211_ATHC_TURBOP && 
+                    as->as_required_mode != IEEE80211_CHAN_ST) {
+                        /* Fixup for dynamic turbo flags */
+                        if (as->as_vap_desired_mode == IEEE80211_MODE_11G)
+                                as->as_required_mode = IEEE80211_CHAN_108G;
+                        else
+                                as->as_required_mode = IEEE80211_CHAN_108A;
+                }
+        }
-
-        ss->ss_last = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        ss->ss_next = 0;
@@ -223 +445 @@
-#endif /* IEEE80211_DEBUG */
-
+        as->as_newscan = 1;
+        SCAN_AP_UNLOCK_IRQ(as);
-        return 0;
-}
@@ -232 +456 @@
-ap_restart(struct ieee80211_scan_state *ss, struct ieee80211vap *vap)
-{
+        struct ap_state *as = ss->ss_priv;
+        as->as_newscan = 1;
-        return 0;
-}
@@ -242 +468 @@
-{
-        struct ap_state *as = ss->ss_priv;
-
-        IEEE80211_CANCEL_TQUEUE(&as->as_actiontq);
-        return 0;
@@ -254 +479 @@
-        const struct ieee80211_frame *wh, int subtype, int rssi, u_int64_t rtsf)
-{
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        if (rssi > as->as_maxrssi[chan])
-                as->as_maxrssi[chan] = rssi;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return 1;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        struct ieee80211vap *vap;
-        struct ieee80211_scan_state *ss;
@@ -289 +577 @@
-        struct ieee80211_channel *chan;
-        int orig;
-ap_
+
-};
-
-
-
+
+
+
-{
-        /* a is better than b (return < 0) when b is marked while a is not */
@@ -299 +588 @@
-}
-
-
-
+
+
+
-                struct ieee80211_channel *b)
-{
@@ -315 +605 @@
-}
-
-
-
+
+
+
-                struct ieee80211_channel *b)
-{
@@ -325 +616 @@
-}
-
-
-
+
+
+
-                struct ieee80211_channel *b)
-{
@@ -335 +627 @@
-}
-
-
-
+
+
+
-                struct ieee80211_channel *b)
-{
@@ -346 +639 @@
-}
-
-use original scan list order
-
-ap_
+This function must be invoked with locks acquired
+
+
-{
-        return a->orig - b->orig;
-}
-
-
-
+
+
+
-{
-        struct ieee80211_channel *a = ((struct channel *)_a)->chan;
-        struct ieee80211_channel *b = ((struct channel *)_b)->chan;
-ap_
+
-        struct ieee80211com *ic = params->vap->iv_ic;
-        int res;
-
-#define EVALUATE_CRITERIUM(name, ...) do {                      \
-ap_
+
-                return res;                                     \
-} while (0)
@@ -370 +664 @@
-        EVALUATE_CRITERIUM(keepmode, params, a, b);
-        EVALUATE_CRITERIUM(sc, ic, a, b);
-ap_
+
-        EVALUATE_CRITERIUM(samechan, ic, a, b);
-        EVALUATE_CRITERIUM(orig, (struct channel *)_a, (struct channel *)_b);
@@ -378 +672 @@
-}
-
+/* This function must be invoked with locks acquired */
-static void
-ap_
+
-{
-        struct ieee80211_channel *t = ((struct channel *)a)->chan;
@@ -396 +691 @@
-/*
- * Pick a quiet channel to use for ap operation.
+ * Must be invoked while we hold the locks.
- */
-static struct ieee80211_channel *
-ap_
+
-{
-        struct ieee80211com *ic = vap->iv_ic;
-st
+as
-        int ss_last = ss->ss_last;
-        struct ieee80211_channel *best;
-        struct ap_state *as = ss->ss_priv;
-        struct channel chans[ss_last]; /* actually ss_last-1 is required */
-
+
+
+
+
-
-        for (i = 0; i < ss_last; i++) {
@@ -414 +713 @@
-        }
-
-ap_pc_cmp, ap_
+pc_cmp, 
-
-        for (i = 0; i < ss_last; i++) {
@@ -426 +725 @@
-        }
-
-chans[0].chan
-st
+NULL
+as
-
-        for (i = 0; i < ss_last; i++) {
-
-
-
+
+
+
+
+
-                if (benefit <= 0)
-                        continue;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        /* break the loop as the subsequent chans won't be better */
-                        break;
-
+                if (!IEEE80211_ARE_CHANS_SAME_MODE(c->chan, ic->ic_bsschan))
+                        /* break the loop as the subsequent chans won't be better */
+                        break;
+
-                if (sta_assoc != 0) {
-hans[i].
+->
-                        if (ic->ic_sc_algorithm == IEEE80211_SC_LOOSE) {
-                                int sl_max = ic->ic_sc_sldg * benefit;
@@ -451 +767 @@
-                IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
-                                                "%s: chan %d, dB gained: %d, STAs lost: %d permil (max %d)\n", __func__,
-hans[i].
+->
-                                if (sl > sl_max)
-                                        continue;
@@ -461 +777 @@
-                }
-        }
-hans[i].
-st
+->
+as
-        }
-
@@ -478 +794 @@
-{
-        struct ap_state *as = ss->ss_priv;
-
-
+
+
+
+
+
-
-        KASSERT(vap->iv_opmode == IEEE80211_M_HOSTAP,
-                ("wrong opmode %u", vap->iv_opmode));
-
-
+
+
-        if (bestchan == NULL) {
-                if (ss->ss_last > 0) {
@@ -492 +812 @@
-                        /* XXX print something? */
-                }
-turn
+s =
-        } else {
-                struct ieee80211_scan_entry se;
@@ -517 +837 @@
-                 */
-                IEEE80211_SCHEDULE_TQUEUE(&as->as_actiontq);
-
-
+
+
+
+
-}
-
@@ -524 +846 @@
-ap_age(struct ieee80211_scan_state *ss)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -531 +864 @@
-        ieee80211_scan_iter_func *f, void *arg)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+