Commit 64463da9 authored by John W. Linville's avatar John W. Linville
Browse files

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	net/mac80211/rate.c
parents 4a6967b8 a120e912

drivers/net/wireless/ath/ath9k/xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -1610,7 +1610,7 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, 
		bf->bf_frmlen -= padsize;

	}



	if (conf_is_ht(&hw->conf) && !is_pae(skb))

	if (conf_is_ht(&hw->conf))

		bf->bf_state.bf_type |= BUF_HT;



	bf->bf_flags = setup_tx_flags(sc, skb, txctl->txq);
@@ -1696,7 +1696,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, 
			goto tx_done;

		}



		if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {

		if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && !is_pae(skb)) {

			/*

			 * Try aggregation if it's a unicast data frame

			 * and the destination is HT capable.

drivers/net/wireless/iwlwifi/iwl-4965.c

+1 −1
Original line number Diff line number Diff line
@@ -2015,7 +2015,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
			IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn "

					   "%d index %d\n", scd_ssn , index);

			freed = iwl_tx_queue_reclaim(priv, txq_id, index);

			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

			iwl_free_tfds_in_queue(priv, sta_id, tid, freed);



			if (priv->mac80211_registered &&

			    (iwl_queue_space(&txq->q) > txq->q.low_mark) &&

drivers/net/wireless/iwlwifi/iwl-5000.c

+3 −5
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
					scd_ssn , index, txq_id, txq->swq_id);



			freed = iwl_tx_queue_reclaim(priv, txq_id, index);

			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

			iwl_free_tfds_in_queue(priv, sta_id, tid, freed);



			if (priv->mac80211_registered &&

			    (iwl_queue_space(&txq->q) > txq->q.low_mark) &&
@@ -1151,15 +1151,13 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
				   tx_resp->failure_frame);



		freed = iwl_tx_queue_reclaim(priv, txq_id, index);

		if (ieee80211_is_data_qos(tx_resp->frame_ctrl))

			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

		iwl_free_tfds_in_queue(priv, sta_id, tid, freed);



		if (priv->mac80211_registered &&

		    (iwl_queue_space(&txq->q) > txq->q.low_mark))

			iwl_wake_queue(priv, txq_id);

	}



	if (ieee80211_is_data_qos(tx_resp->frame_ctrl))

	iwl_txq_check_empty(priv, sta_id, tid, txq_id);



	if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2787,8 +2787,8 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed) 
		if ((le16_to_cpu(priv->staging_rxon.channel) != ch))

			priv->staging_rxon.flags = 0;



		iwl_set_rxon_ht(priv, ht_conf);

		iwl_set_rxon_channel(priv, conf->channel);

		iwl_set_rxon_ht(priv, ht_conf);



		iwl_set_flags_for_band(priv, conf->channel->band);

		spin_unlock_irqrestore(&priv->lock, flags);

drivers/net/wireless/iwlwifi/iwl-core.h

+2 −0
Original line number Diff line number Diff line
@@ -451,6 +451,8 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb); 
void iwl_hw_txq_ctx_free(struct iwl_priv *priv);

int iwl_hw_tx_queue_init(struct iwl_priv *priv,

			 struct iwl_tx_queue *txq);

void iwl_free_tfds_in_queue(struct iwl_priv *priv,

			    int sta_id, int tid, int freed);

void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);

int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,

		      int slots_num, u32 txq_id);