Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
index 8c889fdddf0e2784ece837ac900fdaa7112d1ea1,c710b26a1c866adc98788a479654e76540a4b986..2e3cda75f3ad3a56f7c7091b7ae37cab3ab6284f
--- 1/drivers/net/wireless/iwlwifi/iwl-4965.c
--- 2/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@@ -2051,11 -2046,10 +2051,10 @@@ static void iwl4965_rx_reply_tx(struct 
                    (iwl_queue_space(&txq->q) > txq->q.low_mark))
                        iwl_wake_queue(priv, txq_id);
        }
 -
 -      iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
 +      if (qc && likely(sta_id != IWL_INVALID_STATION))
 +              iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
  
-       if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
-               IWL_ERR(priv, "TODO:  Implement Tx ABORT REQUIRED!!!\n");
+       iwl_check_abort_status(priv, tx_resp->frame_count, status);
  }
  
  static int iwl4965_calc_rssi(struct iwl_priv *priv,