diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2010-11-10 18:25:43 -0800 |
|---|---|---|
| committer |   Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-11-16 07:45:35 -0800 |
| commit | 4bea9b990205e4a3d432d9d6c29687215618a306 (patch) | |
| tree | 4aed13159e194298cc1bf5ebd10879928dab2e2b /drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |
| parent | iwlagn: remove unused variable swq_id (diff) | |
| download | linux-dev-4bea9b990205e4a3d432d9d6c29687215618a306.tar.xz linux-dev-4bea9b990205e4a3d432d9d6c29687215618a306.zip | |
iwlagn: remove a bogus AGG_OFF check
Even if this check were to happen, using the
txq_id here (which is a HW queue) would lead
to confusion in mac80211. Luckily, it doesn't
seem like this can ever happen.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index c6f65fd7675c..2ba83b5bbb8e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/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); |