diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-05-15 06:55:26 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-21 21:48:08 -0400 |
commit | 36d6825b91bc492b65b6333c369cd96a2fc8c903 (patch) | |
tree | 9113754ce110d593da8019a329c4afb229a036b3 /drivers/net/wireless/iwlwifi | |
parent | c4680470a34a4f39af3d0a5c40f70befd8701908 (diff) |
mac80211: let drivers wake but not start queues
Having drivers start queues is just confusing, their ->start()
callback can block and do whatever is necessary, so let mac80211
start queues and have drivers wake queues when necessary (to get
packets flowing again right away.)
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index b8fb8d8d95ff..54cde8a7b5fa 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -5823,7 +5823,7 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv) | |||
5823 | if (iwl3945_is_rfkill(priv)) | 5823 | if (iwl3945_is_rfkill(priv)) |
5824 | return; | 5824 | return; |
5825 | 5825 | ||
5826 | ieee80211_start_queues(priv->hw); | 5826 | ieee80211_wake_queues(priv->hw); |
5827 | 5827 | ||
5828 | priv->active_rate = priv->rates_mask; | 5828 | priv->active_rate = priv->rates_mask; |
5829 | priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK; | 5829 | priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK; |
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 48c59cbefb4a..db4f606bad50 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -3367,7 +3367,7 @@ static void iwl4965_alive_start(struct iwl_priv *priv) | |||
3367 | if (iwl_is_rfkill(priv)) | 3367 | if (iwl_is_rfkill(priv)) |
3368 | return; | 3368 | return; |
3369 | 3369 | ||
3370 | ieee80211_start_queues(priv->hw); | 3370 | ieee80211_wake_queues(priv->hw); |
3371 | 3371 | ||
3372 | priv->active_rate = priv->rates_mask; | 3372 | priv->active_rate = priv->rates_mask; |
3373 | priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK; | 3373 | priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK; |