Ticket #963: 009-csa_ie_handling_fix.diff

madwifi/net80211/ieee80211.h

@@ -363 +363 @@
-        u_int8_t country_triplet[IEEE80211_COUNTRY_MAX_TRIPLETS * 3];
-} __packed;
-
+/*
+ * Channel Switch Announcement information element.
+ */
+struct ieee80211_ie_csa {
+        u_int8_t csa_id;        /* IEEE80211_ELEMID_CHANSWITCHANN */
+        u_int8_t csa_len;       /* == 3 */
+        u_int8_t csa_mode;      /* Channel Switch Mode: 1 == stop transmission until CS */
+        u_int8_t csa_chan;      /* New Channel Number */
+        u_int8_t csa_count;     /* TBTTs until Channel Switch happens */
+} __packed;
+
+/* minimal Channel Switch Count in the initial announcement */
+#define IEEE80211_CSA_PROTECTION_PERIOD 3
+
+/* maximum allowed deviance of measurement of intervals between CSA in Beacons */
+#define IEEE80211_CSA_SANITY_THRESHOLD 100    
+
+
-/* does frame have QoS sequence control data */
-#define IEEE80211_QOS_HAS_SEQ(wh) \
-        (((wh)->i_fc[0] & \

madwifi/net80211/ieee80211_scan.h

@@ -138 +138 @@
-        u_int8_t *ssid;
-        u_int8_t *rates;
-        u_int8_t *xrates;
-doth
+csa
-        u_int8_t *wpa;
-        u_int8_t *rsn;
-        u_int8_t *wme;

madwifi/net80211/ieee80211_input.c

@@ -2237 +2237 @@
-        return c;
-}
-
+static void
+ieee80211_doth_cancel_cs(struct ieee80211vap *vap)
+{
+        del_timer(&vap->iv_csa_timer);
+        if (vap->iv_csa_jiffies) 
+                IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
+                                "channel switch cancelled (was: to %u in %u "
+                                "tbtt, mode %u)\n", vap->iv_csa_chan->ic_ieee,
+                                vap->iv_csa_count, vap->iv_csa_mode);
+        vap->iv_csa_jiffies = 0;
+}
+
+static void
+ieee80211_doth_switch_channel(struct ieee80211vap *vap)
+{
+        struct ieee80211com *ic = vap->iv_ic;
+
+        IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
+                        "%s: Channel switch to %d NOW!\n",
+                        __func__, vap->iv_csa_chan->ic_ieee);
+#if 0
+        /* XXX does not belong here? */
+        /* XXX doesn't stop management frames */
+        /* XXX who restarts the queue? */
+        /* NB: for now, error here is non-catastrophic.
+         *     in the future we may need to ensure we
+         *     stop xmit on this channel.
+         */
+        netif_stop_queue(ic->ic_dev);
+#endif
+
+        vap->iv_csa_jiffies = 0; /* supress "cancel" msg */
+        ieee80211_doth_cancel_cs(vap);
+
+        ic->ic_prevchan = ic->ic_curchan;
+        ic->ic_curchan = ic->ic_bsschan = vap->iv_csa_chan;
+        ic->ic_set_channel(ic);
+}
+
+static void
+ieee80211_doth_switch_channel_tmr(unsigned long arg)
+{
+        struct ieee80211vap *vap = (struct ieee80211vap *)arg;
+        ieee80211_doth_switch_channel(vap);
+}
+
-static int
-dothparams(struct ieee80211vap *vap
+csaie(struct ieee80211_node *ni
-        const struct ieee80211_frame *wh)
-{
+        struct ieee80211vap *vap = ni->ni_vap;
-        struct ieee80211com *ic = vap->iv_ic;
-u_int len = frm[1]
-u_int8_t chan, tbtt
+struct ieee80211_channel *c
+struct ieee80211_ie_csa *csa_ie = (struct ieee80211_ie_csa *)frm
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                IEEE80211_DISCARD_IE(vap,
-                        IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH,
-
+
+
-                return -1;
-        }
-
-
+
+sa_ie->csa_c
-                IEEE80211_DISCARD_IE(vap,
-                        IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH,
-
+
+
-                return -1;
-        }
-        tbtt = frm[4];
-        IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
-                "%s: channel switch to %d in %d tbtt\n", __func__, chan, tbtt);
-        if (tbtt <= 1) {
-                struct ieee80211_channel *c;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                                IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH,
-                                wh, "channel switch",
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        return 0;
-                }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
+
+        vap->iv_csa_jiffies = jiffies;
+
+        if (vap->iv_csa_count <= 1)
+                ieee80211_doth_switch_channel(vap);
+
-        return 0;
-}
-
@@ -2485 +2627 @@
-                                break;
-                        case IEEE80211_ELEMID_CHANSWITCHANN:
-                                if (ic->ic_flags & IEEE80211_F_DOTH)
-doth
+csa
-                                break;
-                        default:
-                                IEEE80211_DISCARD_IE(vap, IEEE80211_MSG_ELEMID,
@@ -2628 +2770 @@
-                                ni->ni_flags &= ~IEEE80211_NODE_UAPSD;
-                        if (scan.ath != NULL)
-                                ieee80211_parse_athParams(ni, scan.ath);
-doth != NULL
-dothparams(vap, scan.doth
+csa != NULL || vap->iv_csa_jiffies
+csaie(ni, scan.csa
-                        if (scan.tim != NULL) {
-                                /*
-                                 * Check the TIM. For now we drop out of

madwifi/net80211/ieee80211_var.h

@@ -87 +87 @@
-#define IEEE80211_MS_TO_TU(x)   (((x) * 1000) / 1024)
-#define IEEE80211_TU_TO_MS(x)   (((x) * 1024) / 1000)
-#define IEEE80211_TU_TO_JIFFIES(x) ((IEEE80211_TU_TO_MS(x) * HZ) / 1000)
+#define IEEE80211_JIFFIES_TO_TU(x) IEEE80211_MS_TO_TU((x) * 1000 / HZ)
-
-#define IEEE80211_PWRCONSTRAINT_VAL(ic) \
-        (((ic)->ic_bsschan->ic_maxregpower > (ic)->ic_curchanmaxpwr) ? \
@@ -341 +342 @@
-        u_int iv_scanvalid;                     /* scan cache valid threshold */
-        struct ieee80211_roam iv_roam;          /* sta-mode roaming state */
-
+        u_int32_t iv_csa_jiffies;               /* last csa recv jiffies */
+        u_int8_t iv_csa_count;                  /* last csa count */
+        struct ieee80211_channel *iv_csa_chan;  /* last csa channel */
+        u_int8_t iv_csa_mode;                   /* last csa mode */
+        struct timer_list iv_csa_timer;         /* csa timer */
-        u_int32_t *iv_aid_bitmap;               /* association id map */
-        u_int16_t iv_max_aid;
-        u_int16_t iv_sta_assoc;                 /* stations associated */

madwifi/net80211/ieee80211_proto.c

@@ -125 +125 @@
-        init_timer(&vap->iv_mgtsend);
-        init_timer(&vap->iv_xrvapstart);
-        init_timer(&vap->iv_swbmiss);
+        init_timer(&vap->iv_csa_timer);
-        vap->iv_mgtsend.function = ieee80211_tx_timeout;
-        vap->iv_mgtsend.data = (unsigned long) vap;
-