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

Commit bd2ce6e4 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

mac80211: Add timeout to BA session start API 



Allow drivers or rate control algorithms to specify BlockAck session
timeout when initiating an ADDBA transaction. This is useful in cases
where maintaining persistent BA sessions does not incur any overhead.

The current timeout value of 5000 TUs is retained for all non ath9k/ath9k_htc
drivers.

Signed-off-by: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a293911d

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

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ void ath9k_tx_tasklet(unsigned long data) 
				ista = (struct ath9k_htc_sta *)sta->drv_priv;



				if (ath9k_htc_check_tx_aggr(priv, ista, tid)) {

					ieee80211_start_tx_ba_session(sta, tid);

					ieee80211_start_tx_ba_session(sta, tid, 0);

					spin_lock_bh(&priv->tx_lock);

					ista->tid_state[tid] = AGGR_PROGRESS;

					spin_unlock_bh(&priv->tx_lock);

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

+1 −1
Original line number Diff line number Diff line
@@ -1373,7 +1373,7 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, 
			an = (struct ath_node *)sta->drv_priv;



			if(ath_tx_aggr_check(sc, an, tid))

				ieee80211_start_tx_ba_session(sta, tid);

				ieee80211_start_tx_ba_session(sta, tid, 0);

		}

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, 
	if (load > IWL_AGG_LOAD_THRESHOLD) {

		IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",

				sta->addr, tid);

		ret = ieee80211_start_tx_ba_session(sta, tid);

		ret = ieee80211_start_tx_ba_session(sta, tid, 5000);

		if (ret == -EAGAIN) {

			/*

			 * driver and mac80211 is out of sync

drivers/net/wireless/rtlwifi/rc.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void rtl_tx_status(void *ppriv, 
			tid = qc[0] & 0xf;



			if (_rtl_tx_aggr_check(rtlpriv, tid))

				ieee80211_start_tx_ba_session(sta, tid);

				ieee80211_start_tx_ba_session(sta, tid, 5000);

		}

	}

}

include/net/mac80211.h

+3 −1
Original line number Diff line number Diff line
@@ -2435,6 +2435,7 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw, 
 * ieee80211_start_tx_ba_session - Start a tx Block Ack session.

 * @sta: the station for which to start a BA session

 * @tid: the TID to BA on.

 * @timeout: session timeout value (in TUs)

 *

 * Return: success if addBA request was sent, failure otherwise

 *
@@ -2442,7 +2443,8 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw, 
 * the need to start aggregation on a certain RA/TID, the session level

 * will be managed by the mac80211.

 */

int ieee80211_start_tx_ba_session(struct ieee80211_sta *sta, u16 tid);

int ieee80211_start_tx_ba_session(struct ieee80211_sta *sta, u16 tid,

				  u16 timeout);



/**

 * ieee80211_start_tx_ba_cb_irqsafe - low level driver ready to aggregate.