]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
iwlegacy: fix stop/wake queue hacks
authorKalle Valo <kvalo@adurom.com>
Mon, 13 Jun 2011 22:34:38 +0000 (01:34 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 20 Jun 2011 19:16:31 +0000 (15:16 -0400)
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>
drivers/net/wireless/iwlegacy/iwl-helpers.h

index a6effdae63f98ffa645eef690eb12ee4aa4feec4..5cf23eaecbbbd41f499ff6151ab22bccbd87c026 100644 (file)
@@ -132,7 +132,16 @@ static inline void iwl_legacy_stop_queue(struct iwl_priv *priv,
                        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
+
+#ifdef ieee80211_wake_queue
+#undef ieee80211_wake_queue
+#endif
+
 #define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue
 
 static inline void iwl_legacy_disable_interrupts(struct iwl_priv *priv)