diff options
| author | Kalle Valo <kvalo@adurom.com> | 2011-06-13 22:34:38 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-20 19:16:31 (GMT) |
| commit | 2055403ded0b16b8fdb7d6f188dccdc9ca35d7d5 (patch) | |
| tree | 9e2808d0a6918488ff31c8439e010a4a5e28b6f1 /drivers/net | |
| parent | a8e827495a3e4d3a096e91b79e644e0665937927 (diff) | |
| download | linux-2055403ded0b16b8fdb7d6f188dccdc9ca35d7d5.tar.xz | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-helpers.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-helpers.h b/drivers/net/wireless/iwlegacy/iwl-helpers.h index a6effda..5cf23ea 100644 --- a/drivers/net/wireless/iwlegacy/iwl-helpers.h +++ b/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); } +#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) |