Browse Source

iwlegacy: fix stop/wake queue hacks

The hacks break once mac80211-compat.h is taken into use. Fix it by adding
an ifdef check.

Signed-off-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Kalle Valo 14 years ago
parent
commit
2055403ded
1 changed files with 9 additions and 0 deletions
  1. 9 0
      drivers/net/wireless/iwlegacy/iwl-helpers.h

+ 9 - 0
drivers/net/wireless/iwlegacy/iwl-helpers.h

@@ -132,7 +132,16 @@ static inline void iwl_legacy_stop_queue(struct iwl_priv *priv,
 			ieee80211_stop_queue(priv->hw, ac);
 			ieee80211_stop_queue(priv->hw, ac);
 }
 }
 
 
+#ifdef ieee80211_stop_queue
+#undef ieee80211_stop_queue
+#endif
+
 #define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue
 #define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue
+
+#ifdef ieee80211_wake_queue
+#undef ieee80211_wake_queue
+#endif
+
 #define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue
 #define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue
 
 
 static inline void iwl_legacy_disable_interrupts(struct iwl_priv *priv)
 static inline void iwl_legacy_disable_interrupts(struct iwl_priv *priv)