Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[linux-2.6] / drivers / net / wireless / iwlwifi / iwl-sta.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index c81ab5f9830f184eb3194a6cd17c49cf55047eae..60a6e010603608eeca8550b5b928f3c3dcaf75e8 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -823,10 +823,9 @@ int iwl_send_lq_cmd(struct iwl_priv *priv,
        if (lq->sta_id == 0xFF)
                lq->sta_id = IWL_AP_ID;
 
-       iwl_dump_lq_cmd(priv,lq);
+       iwl_dump_lq_cmd(priv, lq);
 
-       if (iwl_is_associated(priv) && priv->assoc_station_added &&
-           priv->lq_mngr.lq_ready)
+       if (iwl_is_associated(priv) && priv->assoc_station_added)
                return  iwl_send_cmd(priv, &cmd);
 
        return 0;
@@ -840,7 +839,7 @@ EXPORT_SYMBOL(iwl_send_lq_cmd);
  * for automatic fallback during transmission.
  *
  * NOTE: This sets up a default set of values.  These will be replaced later
- *       if the driver's iwl-4965-rs rate scaling algorithm is used, instead of
+ *       if the driver's iwl-agn-rs rate scaling algorithm is used, instead of
  *       rc80211_simple.
  *
  * NOTE: Run REPLY_ADD_STA command to set up station table entry, before