diff options
| author | Kalle Valo <kvalo@adurom.com> | 2011-06-14 00:34:50 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-20 21:16:32 +0200 |
| commit | 47751b0fbff55f5f65d1a4d24ca10acd90259fc1 (patch) | |
| tree | 92aca9c0c83fe8e7971ac03df8dd6b61a7ce6de6 /drivers/net/wireless/iwlwifi/iwl-helpers.h | |
| parent | iwlegacy: fix stop/wake queue hacks (diff) | |
| download | linux-47751b0fbff55f5f65d1a4d24ca10acd90259fc1.tar.xz linux-47751b0fbff55f5f65d1a4d24ca10acd90259fc1.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-helpers.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-helpers.h | 9 |
1 files changed, 9 insertions, 0 deletions
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) |