Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 832f47e3 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwlagn: use virtual interface in TX aggregation handling 



Most of the TX aggregation handling can be passed
the virtual interface directly instead of having
to rely on priv->vif.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 1dda6d28

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+7 −5
Original line number Diff line number Diff line
@@ -961,7 +961,8 @@ static int iwlagn_txq_ctx_activate_free(struct iwl_priv *priv) 
	return -1;

}



int iwlagn_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn)

int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,

			const u8 *ra, u16 tid, u16 *ssn)

{

	int sta_id;

	int tx_fifo;
@@ -1011,7 +1012,7 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn) 
	if (tid_data->tfds_in_queue == 0) {

		IWL_DEBUG_HT(priv, "HW queue is empty\n");

		tid_data->agg.state = IWL_AGG_ON;

		ieee80211_start_tx_ba_cb_irqsafe(priv->vif, ra, tid);

		ieee80211_start_tx_ba_cb_irqsafe(vif, ra, tid);

	} else {

		IWL_DEBUG_HT(priv, "HW queue is NOT empty: %d packets in HW queue\n",

			     tid_data->tfds_in_queue);
@@ -1020,7 +1021,8 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn) 
	return ret;

}



int iwlagn_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)

int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,

		       const u8 *ra, u16 tid)

{

	int tx_fifo_id, txq_id, sta_id, ssn = -1;

	struct iwl_tid_data *tid_data;
@@ -1046,7 +1048,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid) 
	if (priv->stations[sta_id].tid[tid].agg.state ==

				IWL_EMPTYING_HW_QUEUE_ADDBA) {

		IWL_DEBUG_HT(priv, "AGG stop before setup done\n");

		ieee80211_stop_tx_ba_cb_irqsafe(priv->vif, ra, tid);

		ieee80211_stop_tx_ba_cb_irqsafe(vif, ra, tid);

		priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;

		return 0;

	}
@@ -1083,7 +1085,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid) 
						   tx_fifo_id);

	spin_unlock_irqrestore(&priv->lock, flags);



	ieee80211_stop_tx_ba_cb_irqsafe(priv->vif, ra, tid);

	ieee80211_stop_tx_ba_cb_irqsafe(vif, ra, tid);



	return 0;

}

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

+4 −4
Original line number Diff line number Diff line
@@ -3155,7 +3155,7 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw, 
			return ret;

	case IEEE80211_AMPDU_TX_START:

		IWL_DEBUG_HT(priv, "start Tx\n");

		ret = iwlagn_tx_agg_start(priv, sta->addr, tid, ssn);

		ret = iwlagn_tx_agg_start(priv, vif, sta->addr, tid, ssn);

		if (ret == 0) {

			priv->_agn.agg_tids_count++;

			IWL_DEBUG_HT(priv, "priv->_agn.agg_tids_count = %u\n",
@@ -3164,7 +3164,7 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw, 
		return ret;

	case IEEE80211_AMPDU_TX_STOP:

		IWL_DEBUG_HT(priv, "stop Tx\n");

		ret = iwlagn_tx_agg_stop(priv, sta->addr, tid);

		ret = iwlagn_tx_agg_stop(priv, vif, sta->addr, tid);

		if ((ret == 0) && (priv->_agn.agg_tids_count > 0)) {

			priv->_agn.agg_tids_count--;

			IWL_DEBUG_HT(priv, "priv->_agn.agg_tids_count = %u\n",

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

+3 −2
Original line number Diff line number Diff line
@@ -135,9 +135,10 @@ void iwlagn_rx_reply_rx_phy(struct iwl_priv *priv, 
void iwlagn_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags,

			      struct ieee80211_tx_info *info);

int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb);

int iwlagn_tx_agg_start(struct iwl_priv *priv,

int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,

			const u8 *ra, u16 tid, u16 *ssn);

int iwlagn_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid);

int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,

		       const u8 *ra, u16 tid);

int iwlagn_txq_check_empty(struct iwl_priv *priv,

			   int sta_id, u8 tid, int txq_id);

void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,