瀏覽代碼

iwlwifi: 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 年之前
父節點
當前提交
47751b0fbf
共有 1 個文件被更改,包括 9 次插入0 次删除
  1. 9 0
      drivers/net/wireless/iwlwifi/iwl-helpers.h

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

@@ -120,7 +120,16 @@ static inline void iwl_wake_any_queue(struct iwl_priv *priv,
 	}
 }
 
+#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_disable_interrupts(struct iwl_priv *priv)