Ticket #1033: madwifi-ibss-merge-clean.diff

net80211/ieee80211_node.c

@@ -517 +517 @@
-        struct ieee80211com *ic = ni->ni_ic;
-#endif
-
-
-
+
-                /* unchanged, nothing to do */
-                return 0;
-        }
@@ -1195 +1194 @@
-        struct ieee80211com *ic = vap->iv_ic;
-        struct ieee80211_node *ni;
-
-1
+0
-        if (ni != NULL) {
-                ni->ni_esslen = sp->ssid[1];
-                memcpy(ni->ni_essid, sp->ssid + 2, sp->ssid[1]);

net80211/ieee80211_linux.c

@@ -360 +360 @@
-
-        IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
-        TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
+                        struct timespec t;
-                /* Assume each node needs 500 bytes */
-                if (buf + space < p + 500)
-                        break;
-
+
-                if (ni->ni_vap == vap &&
-                    0 != memcmp(vap->iv_myaddr, ni->ni_macaddr, IEEE80211_ADDR_LEN)) {
-       struct timespec t;
+*/
-                        jiffies_to_timespec(jiffies - ni->ni_last_rx, &t);
-
+
+
+
-                        p += sprintf(p, " rssi %d\n", ni->ni_rssi);
-
-                        p += sprintf(p, " last_rx %ld.%06ld\n",
-                                     t.tv_sec, t.tv_nsec / 1000);
-
+
+
+
-                }
+                        */
-        }
-        IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
-        return (p - buf);

ath/if_ath.c

@@ -4540 +4540 @@
- * the beacon miss handling so we'll receive a BMISS
- * interrupt when we stop seeing beacons from the AP
- * we've associated with.
+ *
+ * Note : TBTT is Target Beacon Transmission Time (see IEEE 802.11-1999)
- */
-static void
-ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap)
@@ -4549 +4551 @@
-        struct ieee80211com *ic = &sc->sc_ic;
-        struct ath_hal *ah = sc->sc_ah;
-        struct ieee80211_node *ni;
-
+
+
+
+
+
-
-        if (vap == NULL)
-                vap = TAILQ_FIRST(&ic->ic_vaps);   /* XXX */
-
-        ni = vap->iv_bss;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* XXX conditionalize multi-bss support? */
-        if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
-                /*
@@ -4572 +4589 @@
-                if (sc->sc_stagbeacons)
-                        intval /= ATH_BCBUF;    /* for staggered beacons */
-                if ((sc->sc_nostabeacons) &&
-    
-nexttbtt = 0
+       
+should_reset_tsf = 1
-        } else
-                intval = ni->ni_intval & HAL_BEACON_PERIOD;
-
+
+
+
+
+
+
+
+
+
+
-                nexttbtt = intval;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (ic->ic_opmode == IEEE80211_M_STA && !(sc->sc_nostabeacons)) {
-                HAL_BEACON_STATE bs;
-                u_int64_t tsf;
-                u_int32_t tsftu;
-                int dtimperiod, dtimcount;
-                int cfpperiod, cfpcount;
-
@@ -4601 +4660 @@
-                        dtimcount = 0;          /* XXX? */
-                cfpperiod = 1;                  /* NB: no PCF support yet */
-                cfpcount = 0;
-#define FUDGE   2
-                /*
-                 * Pull nexttbtt forward to reflect the current
-                 * TSF and calculate dtim+cfp state for the result.
-                 */
-
-
+
+
+
-                do {
-                        nexttbtt += intval;
-                        if (--dtimcount < 0) {
@@ -4615 +4674 @@
-                                if (--cfpcount < 0)
-                                        cfpcount = cfpperiod - 1;
-                        }
-tsftu
+hw_tsftu + FUDGE
-#undef FUDGE
-                memset(&bs, 0, sizeof(bs));
-                bs.bs_intval = intval;
@@ -4689 +4748 @@
-                ath_hal_intrset(ah, sc->sc_imask);
-        } else {
-                ath_hal_intrset(ah, 0);
-nexttbtt == intval
+should_reset_tsf
-                        intval |= HAL_BEACON_RESET_TSF;
-                if (ic->ic_opmode == IEEE80211_M_IBSS) {
-                        /*
@@ -4726 +4785 @@
-                if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol)
-                        ath_beacon_start_adhoc(sc, vap);
-        }
-        sc->sc_syncbeacon = 0;
-#undef TSF_TO_TU
+
+        ath_beacon_config_debug:
+
+        /* we print all debug messages here, in order to preserve the
+           time critical aspect of this function */
+
+        DPRINTF(sc, ATH_DEBUG_BEACON,
+                "%s: ni=%p tsf=%llu hw_tsf=%llu tsftu=%u hw_tsftu=%u\n",
+                __func__, ni, tsf, hw_tsf, tsftu, hw_tsftu);
+
+        if (should_reset_tsf) {
+                /* we just created the interface */
+                DPRINTF(sc, ATH_DEBUG_BEACON, "%s: first beacon\n",__func__);
+        } else {
+                if (tsf == 1) {
+                        /* we do not receive any beacons or probe response */
+                        DPRINTF(sc, ATH_DEBUG_BEACON,
+                                "%s: no beacon received...\n",__func__);
+                } else {
+                        if (tsf > hw_tsf) {
+                                /* we do receive a beacon and the hw TSF has not been updated */
+                                DPRINTF(sc, ATH_DEBUG_BEACON,
+                                        "%s: beacon received, but TSF is incorrect\n",__func__);
+                        } else {
+                                /* we do receive a beacon in the past, normal case */
+                                DPRINTF(sc, ATH_DEBUG_BEACON,
+                                        "%s: beacon received, TSF is correct\n",__func__);
+                        }
+                }
+        }
+
+        DPRINTF(sc, ATH_DEBUG_BEACON, "%s: nexttbtt=%u intval=%u\n",
+                __func__,nexttbtt, intval & HAL_BEACON_PERIOD);
-}
-
-static int
@@ -5595 +5686 @@
-        case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-                if (vap->iv_opmode == IEEE80211_M_IBSS &&
-                    vap->iv_state == IEEE80211_S_RUN) {
+                  
+                  /* jal: added: don't merge if we have a desired
+                     BSSID */
+
+                  if (vap->iv_flags & IEEE80211_F_DESBSSID) {
+                    break;
+                  }
+
+                  /* To handle IBSS merge, we need the struct
+                     ieee80211_node which has been updated with the
+                     BSSID and TSF from the last beacon */
+
+                  ni = ieee80211_find_rxnode(ni->ni_ic,
+                                             (const struct ieee80211_frame_min *) skb->data);
+                  if (ni == NULL) {
+                    break;
+                  }
+
-                        /*
-                         * Handle IBSS merge as needed; check the TSF on the
-                         * frame before attempting the merge.  The 802.11 spec
@@ -5605 +5714 @@
-                         * ath_newstate as the state machine will go from
-                         * RUN -> RUN when this happens.
-                         */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-                break;
-        }