From: Kalle Valo Date: Mon, 13 Jun 2011 22:34:50 +0000 (+0300) Subject: iwlwifi: fix stop/wake queue hacks X-Git-Tag: MMI-PSA29.97-13-9~18350^2~12^2~42^2~404 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=47751b0fbff55f5f65d1a4d24ca10acd90259fc1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h index 41207a3645b8..9d91552d13c1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-helpers.h +++ b/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)