Changeset 2357

Timestamp:

05/21/07 17:53:39 (2 years ago)

Author:

mentor

Message:

Merge ng-refcount to trunk - r2061:r2356

Files:

• trunk/ath/if_ath.c (modified) (23 diffs)
• trunk/ath_rate/minstrel/minstrel.c (modified) (11 diffs)
• trunk/ath_rate/sample/sample.c (modified) (2 diffs)
• trunk/net80211/ieee80211_debug.h (copied) (copied from branches/madwifi-ng-refcount/net80211/ieee80211_debug.h)
• trunk/net80211/ieee80211_input.c (modified) (27 diffs)
• trunk/net80211/ieee80211_linux.c (modified) (2 diffs)
• trunk/net80211/ieee80211_linux.h (modified) (9 diffs)
• trunk/net80211/ieee80211_node.c (modified) (55 diffs)
• trunk/net80211/ieee80211_node.h (modified) (12 diffs)
• trunk/net80211/ieee80211_output.c (modified) (11 diffs)
• trunk/net80211/ieee80211_power.c (modified) (3 diffs)
• trunk/net80211/ieee80211_proto.c (modified) (1 diff)
• trunk/net80211/ieee80211_scan.h (modified) (1 diff)
• trunk/net80211/ieee80211_scan_sta.c (modified) (1 diff)
• trunk/net80211/ieee80211_var.h (modified) (21 diffs)
• trunk/net80211/ieee80211_wireless.c (modified) (10 diffs)

trunk/ath/if_ath.c

@@ -162 +162 @@
-static void ath_desc_free(struct ath_softc *);
-static void ath_desc_swap(struct ath_desc *);
-
-
+
-static void ath_node_cleanup(struct ieee80211_node *);
-static void ath_node_free(struct ieee80211_node *);
@@ -2442 +2441 @@
-                        continue;
-        bad:
-free_node(
+unref_node(&
-                if (bf_ff->bf_skb != NULL) {
-                        dev_kfree_skb(bf_ff->bf_skb);
@@ -2582 +2581 @@
-                        ATH_FF_MAGIC_PUT(skb);
-
+#if 0
-                        /* decrement extra node reference made when an_tx_ffbuf[] was set */
-
+
+
-
-                        DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,
@@ -2642 +2643 @@
-                        DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,
-                                "%s: ff stageq flush failure\n", __func__);
-free_node(
+unref_node(&
-                        if (bf_ff->bf_skb) {
-                                dev_kfree_skb(bf_ff->bf_skb);
@@ -2764 +2765 @@
-                        
-                        if (ni != NULL) 
-free_node(
+unref_node(&
-
-                        STAILQ_INSERT_TAIL(&sc->sc_txbuf, tbf, bf_list);
@@ -2846 +2847 @@
-bad:
-        if (ni != NULL)
-free_node(
+unref_node(&
-        if (bf != NULL) {
-                bf->bf_skb = NULL;
@@ -3235 +3236 @@
-        ni = sc->sc_keyixmap[keyix];
-        if (ni != NULL) {
-free_node(
+unref_node(&
-                sc->sc_keyixmap[keyix] = NULL;
-        }
@@ -3246 +3247 @@
-                ni = sc->sc_keyixmap[keyix + 32];
-                if (ni != NULL) {                       /* as above... */
-free_node(
+unref_node(&
-                        sc->sc_keyixmap[keyix + 32] = NULL;
-                }
@@ -3259 +3260 @@
-                        ni = sc->sc_keyixmap[keyix + rxkeyoff];
-                        if (ni != NULL) {       /* as above... */
-free_node(
+unref_node(&
-                                sc->sc_keyixmap[keyix + rxkeyoff] = NULL;
-                        }
@@ -3815 +3816 @@
-                bf->bf_skb = NULL;
-        }
-
-
-
-
+
+
-
-        /*
@@ -4360 +4359 @@
-                bf->bf_skb = NULL;
-        }
-
-
-
-
+
+
-        STAILQ_INSERT_TAIL(&sc->sc_bbuf, bf, bf_list);
-}
@@ -4382 +4379 @@
-                        bf->bf_skb = NULL;
-                }
-
-
-
-
+
+
-        }
-}
@@ -4671 +4666 @@
-                         * Reclaim node reference.
-                         */
-free_node(
+unref_node(&
-                }
-        }
@@ -4730 +4725 @@
-
-static struct ieee80211_node *
-_node_table *nt,struct ieee80211
-
-nt->nt
+
+
+vap->iv
-        const size_t space = sizeof(struct ath_node) + sc->sc_rc->arc_space;
-        struct ath_node *an;
-
-        an = kmalloc(space, GFP_ATOMIC);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -4770 +4767 @@
-        struct ath_node *an = ATH_NODE(ni);
-        struct ath_buf *bf;
+        struct ieee80211_cb *cb = NULL;
-        
-        /*
@@ -4784 +4782 @@
-                bf = STAILQ_FIRST(&an->an_uapsd_q);
-                STAILQ_REMOVE_HEAD(&an->an_uapsd_q, bf_list);
+
+                cb = (struct ieee80211_cb *) bf->bf_skb->cb;
+                ieee80211_unref_node(&cb->ni);
+                dev_kfree_skb_any(bf->bf_skb);
+
-                bf->bf_desc->ds_link = 0;
-
-                dev_kfree_skb_any(bf->bf_skb);
-                bf->bf_skb = NULL;
-                bf->bf_node = NULL;
+
-                ATH_TXBUF_LOCK_IRQ(sc);
-                STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list);
-                ATH_TXBUF_UNLOCK_IRQ(sc);
-                ieee80211_free_node(ni);
-
-                an->an_uapsd_qdepth--;
@@ -4800 +4801 @@
-                bf = STAILQ_FIRST(&an->an_uapsd_overflowq);
-                STAILQ_REMOVE_HEAD(&an->an_uapsd_overflowq, bf_list);
-
-
+
+
+
-                dev_kfree_skb_any(bf->bf_skb);
+
-                bf->bf_skb = NULL;
-                bf->bf_node = NULL;
+                bf->bf_desc->ds_link = 0;
+                
-                ATH_TXBUF_LOCK_IRQ(sc);
-                STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list);
-                ATH_TXBUF_UNLOCK_IRQ(sc);
-                ieee80211_free_node(ni);
-
-                an->an_uapsd_overflowqdepth--;
-        }
+
+        /* Clean up node-specific rate things - this currently appears to always be a no-op */
+        sc->sc_rc->ops->node_cleanup(sc, ATH_NODE(ni));
-
-        ATH_NODE_UAPSD_LOCK_IRQ(an);
@@ -4823 +4830 @@
-        struct ath_softc *sc = ni->ni_ic->ic_dev->priv;
-
-        sc->sc_rc->ops->node_cleanup(sc, ATH_NODE(ni));
-        sc->sc_node_free(ni);
-#ifdef ATH_SUPERG_XR
@@ -5704 +5710 @@
-                        type = ieee80211_input(ni, skb,
-                                ds->ds_rxstat.rs_rssi, ds->ds_rxstat.rs_tstamp);
-free_node(
+unref_node(&
-                } else {
-                        /*
@@ -5729 +5735 @@
-                                    sc->sc_keyixmap[keyix] == NULL)
-                                        sc->sc_keyixmap[keyix] = ieee80211_ref_node(ni);
-free_node(
+unref_node(&
-                        } else
-                                type = ieee80211_input_all(ic, skb,
@@ -6530 +6536 @@
-                dev_kfree_skb(lastbuf->bf_skb);
-                lastbuf->bf_skb = NULL;
-
-
+
-                ATH_TXBUF_LOCK_IRQ(sc);
-                STAILQ_INSERT_TAIL(&sc->sc_txbuf, lastbuf, bf_list);
@@ -7280 +7285 @@
-                         *     node was timed out due to inactivity.
-                         */
-free_node(
+unref_node(&
-                }
-
@@ -7525 +7530 @@
-#endif /* ATH_SUPERG_FF */
-                if (bf->bf_node)
-free_node(
+unref_node(&
-
-                bf->bf_skb = NULL;

trunk/ath_rate/minstrel/minstrel.c

@@ -343 +343 @@
-
-                        /* Don't look for slowest rate (i.e. slowest
-
+.
-                         * rate works fine, or else other management
-                         * frames will also be failing - therefore the
@@ -350 +350 @@
-                         * link in the first place. */
-                        ndx = sn->rs_sampleTable[sn->rs_sampleIndex][sn->rs_sampleColumn];
-
-
+
-                        sn->rs_sampleIndex++;
-                        if (sn->rs_sampleIndex > (sn->num_rates - 2)) {
-                                sn->rs_sampleIndex = 0;
+                                
-                                sn->rs_sampleColumn++;
-=
+>
-                                        sn->rs_sampleColumn = 0;
-                        }
@@ -479 +479 @@
-
-        if (!mrr) {
-ndx >= 0 && ndx < sn->num_rates
+(0 <= ndx) && (ndx < sn->num_rates)
-                        sn->rs_rateattempts[ndx]++; /* only one rate was used */
-                }
@@ -540 +540 @@
-ath_fill_sample_table(struct minstrel_node *sn)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        sn->rs_sampleColumn = 0;
-        sn->rs_sampleIndex = 0;
-
-
-
+
+
+
-        sn->random_n = 1;
-        sn->a = 1664525;
-        sn->b = 1013904223;
+
+        if (sn->num_rates > 1) {
+                for(column_index = 0; column_index < MINSTREL_COLUMNS; column_index++) {
+                        for (i = 0; i < num_sample_rates; i++) {
+                                get_random_bytes(random_bytes, 8);
+                                newIndex = (i + random_bytes[i & 7]) % num_sample_rates;
+
+                                while (sn->rs_sampleTable[newIndex][column_index] != 0)
+                                        newIndex = (newIndex + 1) % num_sample_rates;
+
+                                sn->rs_sampleTable[newIndex][column_index] = i + 1;
+                        }
+                }
+        }
+
-#if 0
-        char rates[200];
@@ -579 +580 @@
-                p = rates + sprintf(rates, "rates :: %d ", column_index);
-                for (i = 0; i < num_sample_rates; i++)
-
-
+
-                DPRINTF(sc, "%s\n", rates);
-        };
@@ -641 +641 @@
-        
-        ni->ni_txrate = 0;
-        sn->num_rates = ni->ni_rates.rs_nrates;
-
-        if (sn->num_rates <= 0) {
@@ -660 +659 @@
-                 * rate set is checked when the station associates. */
-                /* NB: the rate set is assumed sorted */
-srate >= 0
+(srate >= 0)
-
-                KASSERT(srate >= 0,
@@ -670 +669 @@
-                        dev_info, __func__, ether_sprintf(ni->ni_macaddr), 
-                        sn->rates[srate].rate / 2,
-0x1) ? ".5
+2) ? ".5 
-                return;
-        }
@@ -692 +691 @@
-                for (retry_index = 2; retry_index < ATH_TXMAXTRY; retry_index++) {
-                        tx_time = calc_usecs_unicast_packet(sc, 1200, sn->rates[x].rix, 0, retry_index);
- 
+
-                                break;
-                        sn->retry_count[x] = retry_index;
@@ -918 +917 @@
-                struct ath_softc *sc = vap->iv_ic->ic_dev->priv;;
-
+        IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
-        TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
-                /* Assume each node needs 1500 bytes */
@@ -966 +966 @@
-                p += sprintf(p, "Total packet count::    ideal %d      lookaround %d\n\n", odst->packet_count, odst->sample_count);
-        }
+        IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
-
-        return (p - buf);

trunk/ath_rate/sample/sample.c

@@ -947 +947 @@
-        unsigned int size_bin;
-
+        IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
-        TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
-                /* Assume each node needs 500 bytes */
@@ -997 +998 @@
-                printk("\n");
-        }
+        IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
-
-        return (p - buf);

trunk/net80211/ieee80211_input.c

@@ -490 +490 @@
-                                        ni_wds = ieee80211_find_wds_node(nt, wh->i_addr3);
-                                        if (ni_wds) {
-free_node(
+unref_node(&
-                                                IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
-                                                        wh, NULL, "%s",
@@ -544 +544 @@
-                         * If not, add one.
-                         */
+                        /* XXX: Useless node mgmt API; make better */
-                        if (dir == IEEE80211_FC1_DIR_DSTODS) {
-                                struct ieee80211_node_table *nt;
-                                struct ieee80211_frame_addr4 *wh4;
-                                struct ieee80211_node *ni_wds;
+
-                                if (!(vap->iv_flags_ext & IEEE80211_FEXT_WDS)) {
-                                        IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
@@ -570 +572 @@
-                                        ieee80211_add_wds_addr(nt, ni, wh4->i_addr4, 0);
-                                else
-free_node(ni_wds); /* Decr
+unref_node(&ni_wds); /* Decr.
-                        }
-                        
@@ -937 +939 @@
-                ni = ieee80211_ref_node(vap->iv_bss);
-                type = ieee80211_input(ni, skb1, rssi, rstamp);
-free_node(
+unref_node(&
-        }
-        if (skb != NULL)                /* no vaps, reclaim skb */
@@ -987 +989 @@
-
-        /*
-         * Use this lock to make sure ni->ni_rxfrag is
-         * not freed by the timer process while we use it.
-         * XXX bogus
-         */
-        IEEE80211_NODE_LOCK_IRQ(ni->ni_table);
-
-        /*
-         * Update the time stamp.  As a side effect, it
-         * also makes sure that the timer will not change
-         * ni->ni_rxfrag for at least 1 second, or in
-         * other words, for the remaining of this function.
+         * XXX HUGE HORRIFIC HACK
-         */
-        ni->ni_rxfragstamp = jiffies;
-
-        IEEE80211_NODE_UNLOCK_IRQ(ni->ni_table);
-
-        /*
@@ -1131 +1125 @@
-                                }
-                                /* XXX statistic? */
-free_node(
+unref_node(&
-                        }
-                }
@@ -1266 +1260 @@
-{
-        struct ieee80211vap *vap = ni->ni_vap;
+        unsigned int tmpnode = 0;
-
-        if (ni->ni_authmode == IEEE80211_AUTH_SHARED) {
@@ -1273 +1268 @@
-                vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */
-                if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
-                        /* XXX hack to workaround calling convention */
-
-                        /* XXX To send the frame to the requesting STA, we have to
-                         * create a node for the station that we're going to reject.
-                         * The node will be freed automatically */
-                        if (ni == vap->iv_bss) {
-
+, 0
-                                if (ni == NULL)
-                                        return;
@@ -1286 +1276 @@
-                                "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), 
-                                ieee80211_node_refcnt(ni));
+                                tmpnode = 1;
-                        }
-                        IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH,
-                                (seq + 1) | (IEEE80211_STATUS_ALG << 16));
+                        
+                        if (tmpnode)
+                                ieee80211_unref_node(&ni);
-                        return;
-                }
@@ -1316 +1310 @@
-                /* always accept open authentication requests */
-                if (ni == vap->iv_bss) {
-
+, 0
-                        if (ni == NULL)
-                                return;
@@ -1323 +1317 @@
-                        "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), 
-                        ieee80211_node_refcnt(ni));
-
-
-
-
-
-
-
-
-
-
+
+
+
-                IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1);
-                IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH,
@@ -1342 +1329 @@
-                if (ni->ni_authmode != IEEE80211_AUTH_8021X)
-                        ieee80211_node_authorize(ni);
+                if (tmpnode)
+                        ieee80211_unref_node(&ni);
-                break;
-
@@ -1380 +1369 @@
-
-        if (ni == vap->iv_bss) {
-tmp_node(vap, mac
+dup_bss(vap, mac, 1
-                if (ni == NULL) {
-                        /* XXX msg */
@@ -1390 +1379 @@
-        IEEE80211_SEND_MGMT(ni, subtype, arg);
-        if (istmp)
-free_node(
+unref_node(&
-}
-
@@ -1416 +1405 @@
-        struct ieee80211vap *vap = ni->ni_vap;
-        u_int8_t *challenge;
-, estatus
+ = 0, estatus = 0
-
-        /*
@@ -1426 +1415 @@
-         * for sanity/consistency.
-         */
-        estatus = 0;                    /* NB: silence compiler */
-        if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) {
-                IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH,
@@ -1506 +1494 @@
-                case IEEE80211_AUTH_SHARED_REQUEST:
-                        if (ni == vap->iv_bss) {
-
+, 0
-                                if (ni == NULL) {
-                                        /* NB: no way to return an error */
@@ -1517 +1505 @@
-
-                                allocbs = 1;
-
-
-
-
-
-
-
-
-
-
-
+
+
-                        ni->ni_rssi = rssi;
-                        ni->ni_rstamp = rstamp;
@@ -1621 +1600 @@
-        return;
-bad:
-
-
-
+
-        if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
-                /* XXX hack to workaround calling convention */
@@ -1629 +1606 @@
-                        IEEE80211_FC0_SUBTYPE_AUTH,
-                        (seq + 1) | (estatus<<16));
+                ieee80211_node_leave(ni);
-        } else if (vap->iv_opmode == IEEE80211_M_STA) {
-                /*
@@ -2092 +2070 @@
-        if (len > 2)
-                rsn_parm->rsn_caps = LE_READ_2(frm);
-
+ 
-
-        return 0;
@@ -2601 +2579 @@
-        u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath;
-        u_int8_t rate;
-
+ = 0
-        u_int8_t qosinfo;
-
@@ -3009 +2987 @@
-                                        wh->i_addr2);
-                        } else {
-tmp_node(vap, wh->i_addr2
+dup_bss(vap, wh->i_addr2, 1
-                        }
-                        if (ni == NULL)
-                                return;
-                        allocbs = 1;
- else
-
+
+
-                IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2,
-                        "%s", "recv probe req");
@@ -3038 +3016 @@
-                         * response, reclaim immediately
-                         */
-free_node(
+unref_node(&
-                } else if (ath != NULL)
-                        ieee80211_saveath(ni, ath);
@@ -3068 +3046 @@
-                                else {
-                                        ieee80211_node_leave(ni);
+                                        /* This would be a stupid place to add a node to the table
+                                         * XR stuff needs work anyway
+                                         */
-                                        ieee80211_node_reset(ni, vap->iv_xrvap);
-                                }
@@ -3080 +3061 @@
-                IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr2,
-                        "recv auth frame with algorithm %d seq %d", algo, seq);
-
-
-
+
-                if (vap->iv_acl != NULL &&
-                    !vap->iv_acl->iac_check(vap, wh->i_addr2)) {
@@ -3115 +3094 @@
-                                ieee80211_send_error(ni, wh->i_addr2,
-                                        IEEE80211_FC0_SUBTYPE_AUTH,
-+
+ + 
-                        }
-                        return;

trunk/net80211/ieee80211_linux.c

@@ -359 +359 @@
-        struct ieee80211_node_table *nt = (struct ieee80211_node_table *) &vap->iv_ic->ic_sta;
-
-//IEEE80211_NODE_LOCK(nt);                                                                               
+IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
-        TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
-                /* Assume each node needs 500 bytes */
@@ -377 +377 @@
-                }
-        }
-//IEEE80211_NODE_UNLOCK(nt);                                                                             
+IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
-        return (p - buf);
-}

trunk/net80211/ieee80211_linux.h

@@ -64 +64 @@
-#define IEEE80211_RESCHEDULE    schedule
-
+/* Locking */
+/* NB: beware, spin_is_locked() is not usefully defined for !(DEBUG || SMP)
+ * because spinlocks do not exist in this configuration. Instead IRQs 
+ * or pre-emption are simply disabled, as this is all that is needed.
+ */
+
-/*
- * Beacon handler locking definitions.
@@ -86 +92 @@
-#define IEEE80211_UNLOCK(_ic)   spin_unlock(&(_ic)->ic_comlock)
-
-
-
+
-#define IEEE80211_LOCK_ASSERT(_ic) \
-        KASSERT(spin_is_locked(&(_ic)->ic_comlock),("ieee80211com not locked!"))
@@ -93 +98 @@
-#define IEEE80211_LOCK_ASSERT(_ic)
-#endif
+
-
-#define IEEE80211_VAPS_LOCK_INIT(_ic, _name)            \