From 165f25522adf468fefe19128f99591acac2bb921 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 14 Jun 2011 01:34:50 +0300 Subject: [PATCH] --- yaml --- r: 255777 b: refs/heads/master c: 47751b0fbff55f5f65d1a4d24ca10acd90259fc1 h: refs/heads/master i: 255775: 3384c1e3903553a47efc6256027eef5f457d5530 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 098df31eb779..52bdd7e76caf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2055403ded0b16b8fdb7d6f188dccdc9ca35d7d5 +refs/heads/master: 47751b0fbff55f5f65d1a4d24ca10acd90259fc1 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h b/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h index 41207a3645b8..9d91552d13c1 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h +++ b/trunk/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)