From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 12 Apr 2010 19:20:53 +0000 (-0400)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b1f90866fb3a329b1c4ebfff93ae9c110943e50a;p=linux-beck.git

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

b1f90866fb3a329b1c4ebfff93ae9c110943e50a
diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
index 8c889fdddf0e,c710b26a1c86..2e3cda75f3ad
--- a/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,