From 0a1d9b51c478c0a8b491fe020ef460c4840d83d3 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 10 Nov 2010 18:25:43 -0800 Subject: [PATCH] --- yaml --- r: 224637 b: refs/heads/master c: 4bea9b990205e4a3d432d9d6c29687215618a306 h: refs/heads/master i: 224635: a833da9bd176488db245d3966bf1ad1f77b16f7f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 8 ++------ trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 8 ++------ 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index ec67c768c86b..61f67eb1fce7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d56396ac3926412dd97dcb9dd8d0cef556b908e +refs/heads/master: 4bea9b990205e4a3d432d9d6c29687215618a306 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c index 19da3e5e9eeb..19400792a3fe 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -2238,12 +2238,8 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, if (priv->mac80211_registered && (iwl_queue_space(&txq->q) > txq->q.low_mark) && - (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) { - if (agg->state == IWL_AGG_OFF) - iwl_wake_queue(priv, txq_id); - else - iwl_wake_queue(priv, txq->swq_id); - } + (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) + iwl_wake_queue(priv, txq->swq_id); } } else { info->status.rates[0].count = tx_resp->failure_frame + 1; diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index c6f65fd7675c..2ba83b5bbb8e 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c @@ -445,12 +445,8 @@ static void iwlagn_rx_reply_tx(struct iwl_priv *priv, if (priv->mac80211_registered && (iwl_queue_space(&txq->q) > txq->q.low_mark) && - (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) { - if (agg->state == IWL_AGG_OFF) - iwl_wake_queue(priv, txq_id); - else - iwl_wake_queue(priv, txq->swq_id); - } + (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) + iwl_wake_queue(priv, txq->swq_id); } } else { BUG_ON(txq_id != txq->swq_id);