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

Commit 86b4766b authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: remove un-necessary rs_tl_turn_on_agg() after agg enabled 



After the MLME handshaking complete and tx aggregation started for the
tid. Do not send unnecessary turn on aggregation request to mac80211.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent adb7b5e6

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

+10 −2
Original line number Diff line number Diff line
@@ -1700,6 +1700,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, 
	u16 high_low;

	s32 sr;

	u8 tid = MAX_TID_COUNT;

	struct iwl_tid_data *tid_data;



	IWL_DEBUG_RATE(priv, "rate scale calculate new rate for skb\n");
@@ -2035,8 +2036,15 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, 
			if ((lq_sta->last_tpt > IWL_AGG_TPT_THREHOLD) &&

			    (lq_sta->tx_agg_tid_en & (1 << tid)) &&

			    (tid != MAX_TID_COUNT)) {

				IWL_DEBUG_RATE(priv, "try to aggregate tid %d\n", tid);

				rs_tl_turn_on_agg(priv, tid, lq_sta, sta);

				tid_data =

				   &priv->stations[lq_sta->lq.sta_id].tid[tid];

				if (tid_data->agg.state == IWL_AGG_OFF) {

					IWL_DEBUG_RATE(priv,

						       "try to aggregate tid %d\n",

						       tid);

					rs_tl_turn_on_agg(priv, tid,

							  lq_sta, sta);

				}

			}

			lq_sta->action_counter = 0;

			rs_set_stay_in_table(priv, 0, lq_sta);