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

Commit 82ca9341 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: sanity check for turn on aggregation tid 



Perform sanity check for turn on aggregation tid. Also remove the
option for turn on all the aggregation tids at once since it is
deprecated function and not being used.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 33e6f816

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

+17 −17
Original line number Diff line number Diff line
@@ -294,11 +294,11 @@ static u32 rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid) 
	return tl->total;

}



static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,

static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,

				      struct iwl_lq_sta *lq_data, u8 tid,

				      struct ieee80211_sta *sta)

{

	int ret;

	int ret = -EAGAIN;



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

		IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
@@ -312,31 +312,31 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, 
			 */

			IWL_DEBUG_HT(priv, "Fail start Tx agg on tid: %d\n",

				tid);

			ret = ieee80211_stop_tx_ba_session(sta, tid,

			ieee80211_stop_tx_ba_session(sta, tid,

						WLAN_BACK_INITIATOR);

		}

	}

	} else

		IWL_ERR(priv, "Fail finding valid aggregation tid: %d\n", tid);

	return ret;

}



static void rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,

			      struct iwl_lq_sta *lq_data,

			      struct ieee80211_sta *sta)

{

	if ((tid < TID_MAX_LOAD_COUNT))

		rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);

	else if (tid == IWL_AGG_ALL_TID)

		for (tid = 0; tid < TID_MAX_LOAD_COUNT; tid++)

			rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);

	if ((tid < TID_MAX_LOAD_COUNT) &&

	    !rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta)) {

		if (priv->cfg->use_rts_for_ht) {

			/*

		 * switch to RTS/CTS if it is the prefer protection method

		 * for HT traffic

			 * switch to RTS/CTS if it is the prefer protection

			 * method for HT traffic

			 */

			IWL_DEBUG_HT(priv, "use RTS/CTS protection for HT\n");

			priv->staging_rxon.flags &= ~RXON_FLG_SELF_CTS_EN;

			iwlcore_commit_rxon(priv);

		}

	}

}



static inline int get_num_of_ant_from_rate(u32 rate_n_flags)

{