diff options
author | Kalle Valo <kvalo@adurom.com> | 2011-06-13 18:34:38 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-20 15:16:31 -0400 |
commit | 2055403ded0b16b8fdb7d6f188dccdc9ca35d7d5 (patch) | |
tree | 9e2808d0a6918488ff31c8439e010a4a5e28b6f1 /drivers/net/wireless/iwlegacy | |
parent | a8e827495a3e4d3a096e91b79e644e0665937927 (diff) |
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/wireless/iwlegacy')
-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 a6effdae63f9..5cf23eaecbbb 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, | |||
132 | ieee80211_stop_queue(priv->hw, ac); | 132 | ieee80211_stop_queue(priv->hw, ac); |
133 | } | 133 | } |
134 | 134 | ||
135 | #ifdef ieee80211_stop_queue | ||
136 | #undef ieee80211_stop_queue | ||
137 | #endif | ||
138 | |||
135 | #define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue | 139 | #define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue |
140 | |||
141 | #ifdef ieee80211_wake_queue | ||
142 | #undef ieee80211_wake_queue | ||
143 | #endif | ||
144 | |||
136 | #define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue | 145 | #define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue |
137 | 146 | ||
138 | static inline void iwl_legacy_disable_interrupts(struct iwl_priv *priv) | 147 | static inline void iwl_legacy_disable_interrupts(struct iwl_priv *priv) |