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

Commit ff550cb4 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: don't access mac80211's AMPDU state machine 



There really is no need, at worst ieee80211_start_tx_ba_session
will log a message when debugging is enabled, and poking such
internals of mac80211 definitely doesn't belong into an RC
algorithm.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 687c7c08

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -359,15 +359,9 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, 
				      struct iwl_lq_sta *lq_data, u8 tid,

				      struct iwl_lq_sta *lq_data, u8 tid,

				      struct sta_info *sta)

				      struct sta_info *sta)

{

{

	unsigned long state;

	DECLARE_MAC_BUF(mac);

	DECLARE_MAC_BUF(mac);





	spin_lock_bh(&sta->lock);

	if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) {

	state = sta->ampdu_mlme.tid_state_tx[tid];

	spin_unlock_bh(&sta->lock);



	if (state == HT_AGG_STATE_IDLE &&

	    rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) {

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

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

				print_mac(mac, sta->sta.addr), tid);

				print_mac(mac, sta->sta.addr), tid);

		ieee80211_start_tx_ba_session(priv->hw, sta->sta.addr, tid);

		ieee80211_start_tx_ba_session(priv->hw, sta->sta.addr, tid);