From b41552527371c50fe69c8e56e605694ea9cf5551 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 14 Jun 2011 01:34:38 +0300 Subject: [PATCH] --- yaml --- r: 255776 b: refs/heads/master c: 2055403ded0b16b8fdb7d6f188dccdc9ca35d7d5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlegacy/iwl-helpers.h | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d9871d1c6170..098df31eb779 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8e827495a3e4d3a096e91b79e644e0665937927 +refs/heads/master: 2055403ded0b16b8fdb7d6f188dccdc9ca35d7d5 diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-helpers.h b/trunk/drivers/net/wireless/iwlegacy/iwl-helpers.h index a6effdae63f9..5cf23eaecbbb 100644 --- a/trunk/drivers/net/wireless/iwlegacy/iwl-helpers.h +++ b/trunk/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)