Ticket #907: preempt-has-no-spinlocks-here2.diff

net80211/ieee80211_linux.h

@@ -64 +64 @@
-#define IEEE80211_RESCHEDULE    schedule
-
-/* Locking */
-UP+!PREEMPT 
+non-SMP
- * because spinlocks do not exist in this configuration. Instead IRQs 
- * are simply disabled, as this is all that is needed 
- */
@@ -91 +91 @@
-#define IEEE80211_LOCK(_ic)     spin_lock(&(_ic)->ic_comlock)
-#define IEEE80211_UNLOCK(_ic)   spin_unlock(&(_ic)->ic_comlock)
-
-(defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+defined(CONFIG_SMP
-#define IEEE80211_LOCK_ASSERT(_ic) \
-        KASSERT(spin_is_locked(&(_ic)->ic_comlock),("ieee80211com not locked!"))
-#else
@@ -114 +114 @@
-} while (0)
-#define IEEE80211_VAPS_UNLOCK_IRQ_EARLY(_ic)    spin_unlock_irqrestore(&(_ic)->ic_vapslock, _vaps_lockflags)
-
-(defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+defined(CONFIG_SMP
-#define IEEE80211_VAPS_LOCK_ASSERT(_ic) \
-        KASSERT(spin_is_locked(&(_ic)->ic_vapslock), \
-                ("ieee80211com_vaps not locked!"))
@@ -146 +146 @@
-#define IEEE80211_NODE_UNLOCK_IRQ_EARLY(_ni)            \
-        spin_unlock_irqrestore(&(_ni)->ni_nodelock, __node_lockflags);
-
-(defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+defined(CONFIG_SMP
-#define IEEE80211_NODE_LOCK_ASSERT(_nt) \
-        KASSERT(spin_is_locked(&(_ni)->ni_nodelock), \
-                ("802.11 node not locked!"))
@@ -177 +177 @@
-#define IEEE80211_NODE_TABLE_UNLOCK_IRQ_EARLY(_nt)              \
-        spin_unlock_irqrestore(&(_nt)->nt_nodelock, __node_lockflags);
-
-(defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+defined(CONFIG_SMP
-#define IEEE80211_NODE_TABLE_LOCK_ASSERT(_nt) \
-        KASSERT(spin_is_locked(&(_nt)->nt_nodelock), \
-                ("802.11 node table not locked!"))
@@ -202 +202 @@
-#define IEEE80211_SCAN_UNLOCK_IRQ_EARLY(_nt)            \
-        spin_unlock_irqrestore(&(_nt)->nt_scanlock, __scan_lockflags);
-
-(defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+defined(CONFIG_SMP
-#define IEEE80211_SCAN_LOCK_ASSERT(_nt) \
-        KASSERT(spin_is_locked(&(_nt)->nt_scanlock), ("scangen not locked!"))
-#else
@@ -220 +220 @@
-#define ACL_LOCK_BH(_as)                spin_lock_bh(&(_as)->as_lock)
-#define ACL_UNLOCK_BH(_as)              spin_unlock_bh(&(_as)->as_lock)
-
-(defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+defined(CONFIG_SMP
-#define ACL_LOCK_ASSERT(_as) \
-        KASSERT(spin_is_locked(&(_as)->as_lock), ("ACL not locked!"))
-#else