Ticket #1329: madwifi-locks.diff

net80211/ieee80211_node.c

@@ -1417 +1417 @@
-                 * the table.
-                 */
-                if (ni->ni_table != NULL) {
-
+_IRQ
-                        _ieee80211_free_node(ni);
-
+_IRQ
-                } else
-                        _ieee80211_free_node(ni);
-        }
@@ -1661 +1661 @@
-        IEEE80211_SCAN_LOCK_IRQ(nt);
-        gen = ++nt->nt_scangen;
-restart:
-
+_IRQ
-        TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
-                if (dev != NULL && ni->ni_vap->iv_dev != dev) 
-                        continue;  /* skip node not for this vap */
-                if (ni->ni_scangen != gen) {
-                        ni->ni_scangen = gen;
-                        (void) ieee80211_ref_node(ni);
-
+_IRQ_EARLY
-                        (*f)(arg, ni);
-                        ieee80211_free_node(ni);
-                        goto restart;
-                }
-        }
-
+_IRQ
-
-        IEEE80211_SCAN_UNLOCK_IRQ(nt);
-}

net80211/ieee80211_beacon.c

@@ -286 +286 @@
-        int len_changed = 0;
-        u_int16_t capinfo;
-
-
+_IRQ
-
-        if ((ic->ic_flags & IEEE80211_F_DOTH) &&
-            (vap->iv_flags & IEEE80211_F_CHANSWITCH) &&
@@ -307 +307 @@
-                if (c == NULL) {
-                        IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
-                                "%s: find channel failure\n", __func__);
-
+_IRQ_EARLY
-                        return 0;
-                }
-                ic->ic_bsschan = c;
@@ -547 +547 @@
-                vap->iv_flags_ext &= ~IEEE80211_FEXT_APPIE_UPDATE;
-        }
-
-
+_IRQ
-
-        return len_changed;
-}

net80211/ieee80211_input.c

@@ -3675 +3675 @@
-        }
-
-        /* Okay, take the first queued packet and put it out... */
-
+_BH
-        IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen);
-
+_BH
-        if (skb == NULL) {
-                IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_POWER, wh->i_addr2,
-                        "%s", "recv ps-poll, but queue empty");

net80211/ieee80211_power.c

@@ -112 +112 @@
-        struct sk_buff *skb;
-        int qlen;
-
-
+_BH
-        qlen = skb_queue_len(&ni->ni_savedq);
-        while ((skb = __skb_dequeue(&ni->ni_savedq)) != NULL) {
-                ieee80211_free_node(ni);
-                dev_kfree_skb_any(skb);
-        }
-
+_BH
-
-        return qlen;
-}
@@ -145 +145 @@
-#endif
-                struct sk_buff *skb;
-
-
+_BH
-                while ((skb = skb_peek(&ni->ni_savedq)) != NULL &&
-                     M_AGE_GET(skb) < IEEE80211_INACT_WAIT) {
-                        IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni,
@@ -157 +157 @@
-                }
-                if (skb != NULL)
-                        M_AGE_SUB(skb, IEEE80211_INACT_WAIT);
-
+_BH
-
-                IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni,
-                        "discard %u frames for age", discard);
@@ -183 +183 @@
-        KASSERT(aid < vap->iv_max_aid,
-                ("bogus aid %u, max %u", aid, vap->iv_max_aid));
-
-
+_IRQ
-        if (set != (isset(vap->iv_tim_bitmap, aid) != 0)) {
-                if (set) {
-                        setbit(vap->iv_tim_bitmap, aid);
@@ -194 +194 @@
-                }
-                vap->iv_flags |= IEEE80211_F_TIMUPDATE;
-        }
-
+_IRQ
-}
-
-/*
@@ -295 +295 @@
-                struct sk_buff *skb;
-                int qlen;
-
-
+_BH
-                IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen);
-
+_BH
-                if (skb == NULL)
-                        break;
-                /* 
@@ -359 +359 @@
-                        for (;;) {
-                                struct sk_buff *skb;
-
-
+_BH
-                                skb = __skb_dequeue(&ni->ni_savedq);
-
+_BH
-                                if (skb == NULL)
-                                        break;
-                                ieee80211_parent_queue_xmit(skb);

net80211/ieee80211_proto.c

@@ -633 +633 @@
-{
-        struct ieee80211com *ic = vap->iv_ic;
-
-
+_IRQ
-        ieee80211_wme_initparams_locked(vap);
-
+_IRQ
-}
-
-void
@@ -918 +918 @@
-        struct ieee80211com *ic = vap->iv_ic;
-
-        if (ic->ic_caps & IEEE80211_C_WME) {
-
+_IRQ
-                ieee80211_wme_updateparams_locked(vap);
-
+_IRQ
-        }
-}
-

net80211/ieee80211_linux.h

@@ -80 +80 @@
-} while (0)
-#define IEEE80211_UNLOCK_IRQ_EARLY(_ic)                                 \
-        spin_unlock_irqrestore(&(_ic)->ic_comlock, __ilockflags);
-#define IEEE80211_LOCK_BH(_ic)  spin_lock_bh(&(_ic)->ic_comlock)
-#define IEEE80211_UNLOCK_BH(_ic) spin_unlock_bh(&(_ic)->ic_comlock)
-#define IEEE80211_LOCK(_ic)     spin_lock(&(_ic)->ic_comlock)
-#define IEEE80211_UNLOCK(_ic)   spin_unlock(&(_ic)->ic_comlock)
-
-/* NB: beware, spin_is_locked() is unusable for !SMP */
-#if defined(CONFIG_SMP)
@@ -96 +92 @@
-#define IEEE80211_VAPS_LOCK_INIT(_ic, _name)            \
-        spin_lock_init(&(_ic)->ic_vapslock)
-#define IEEE80211_VAPS_LOCK_DESTROY(_ic)
-#define IEEE80211_VAPS_LOCK(_ic)        spin_lock(&(_ic)->ic_vapslock);
-#define IEEE80211_VAPS_UNLOCK(_ic)      spin_unlock(&(_ic)->ic_vapslock);
-#define IEEE80211_VAPS_LOCK_BH(_ic)     spin_lock_bh(&(_ic)->ic_vapslock);
-#define IEEE80211_VAPS_UNLOCK_BH(_ic)   spin_unlock_bh(&(_ic)->ic_vapslock);
-#define IEEE80211_VAPS_LOCK_IRQ(_ic)    do {    \
-        int _vaps_lockflags;                    \
-        spin_lock_irqsave(&(_ic)->ic_vapslock, _vaps_lockflags);
-#define IEEE80211_VAPS_UNLOCK_IRQ(_ic)  \
-        spin_unlock_irqrestore(&(_ic)->ic_vapslock, _vaps_lockflags); \
-} while (0)
-#define IEEE80211_VAPS_UNLOCK_IRQ_EARLY(_ic)    spin_unlock_irqrestore(&(_ic)->ic_vapslock, _vaps_lockflags)
-
-
-/* NB: beware, spin_is_locked() is unusable for !SMP */
-#if defined(CONFIG_SMP)
-#define IEEE80211_VAPS_LOCK_ASSERT(_ic) \
@@ -124 +110 @@
-typedef spinlock_t ieee80211_node_lock_t;
-#define IEEE80211_NODE_LOCK_INIT(_nt, _name)    spin_lock_init(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_LOCK_DESTROY(_nt)
-#define IEEE80211_NODE_LOCK(_nt)        spin_lock(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_UNLOCK(_nt)      spin_unlock(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_LOCK_BH(_nt)     spin_lock_bh(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_UNLOCK_BH(_nt)   spin_unlock_bh(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_LOCK_IRQ(_nt)    do {    \
-        unsigned long __node_lockflags;         \
-        spin_lock_irqsave(&(_nt)->nt_nodelock, __node_lockflags);
@@ -152 +134 @@
-typedef spinlock_t ieee80211_scan_lock_t;
-#define IEEE80211_SCAN_LOCK_INIT(_nt, _name) spin_lock_init(&(_nt)->nt_scanlock)
-#define IEEE80211_SCAN_LOCK_DESTROY(_nt)
-#define IEEE80211_SCAN_LOCK_BH(_nt)     spin_lock_bh(&(_nt)->nt_scanlock)
-#define IEEE80211_SCAN_UNLOCK_BH(_nt)   spin_unlock_bh(&(_nt)->nt_scanlock)
-#define IEEE80211_SCAN_LOCK_IRQ(_nt)    do {    \
-        unsigned long __scan_lockflags;         \
-        spin_lock_irqsave(&(_nt)->nt_scanlock, __scan_lockflags);
@@ -179 +159 @@
-#define ACL_LOCK_DESTROY(_as)
-#define ACL_LOCK(_as)                   spin_lock(&(_as)->as_lock)
-#define ACL_UNLOCK(_as)                 spin_unlock(&(_as)->as_lock)
-#define ACL_LOCK_BH(_as)                spin_lock_bh(&(_as)->as_lock)
-#define ACL_UNLOCK_BH(_as)              spin_unlock_bh(&(_as)->as_lock)
-
-/* NB: beware, spin_is_locked() is unusable for !SMP */
-#if defined(CONFIG_SMP)
@@ -203 +181 @@
-        skb_queue_head_init(&(_ni)->ni_savedq);                 \
-} while (0)
-#define IEEE80211_NODE_SAVEQ_DESTROY(_ni)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-/* caller MUST lock IEEE80211_NODE_SAVEQ */
-#define IEEE80211_NODE_SAVEQ_DEQUEUE(_ni, _skb, _qlen) do {     \