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

Commit fcc5e851 authored by Eyal Shapira's avatar Eyal Shapira Committed by Emmanuel Grumbach
Browse files

iwlwifi: rs: cleanup last_txrate_idx 



last_txrate_idx isn't used anymore and can be dropped as this info
exists already somewhere else.

Signed-off-by: default avatarEyal Shapira <eyalx.shapira@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 867e214e

drivers/net/wireless/iwlwifi/mvm/rs.c

+3 −7
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as
@@ -2133,7 +2133,7 @@ static void rs_rate_scale_perform(struct iwl_mvm *mvm, 
	}



	/* current tx rate */

	index = lq_sta->last_txrate_idx;

	index = rate->index;



	/* rates available for this association, and for modulation mode */

	rate_mask = rs_get_supported_rates(lq_sta, rate);
@@ -2181,7 +2181,7 @@ static void rs_rate_scale_perform(struct iwl_mvm *mvm, 
		 * or search for a new one? */

		rs_stay_in_table(lq_sta, false);



		goto out;

		return;

	}

	/* Else we have enough samples; calculate estimate of

	 * actual average throughput */
@@ -2400,9 +2400,6 @@ static void rs_rate_scale_perform(struct iwl_mvm *mvm, 
			rs_set_stay_in_table(mvm, 0, lq_sta);

		}

	}



out:

	lq_sta->last_txrate_idx = index;

}



struct rs_init_rate_info {
@@ -2545,7 +2542,6 @@ static void rs_initialize_lq(struct iwl_mvm *mvm, 
	rate = &tbl->rate;



	rs_get_initial_rate(mvm, lq_sta, band, rate);

	lq_sta->last_txrate_idx = rate->index;



	WARN_ON_ONCE(rate->ant != ANT_A && rate->ant != ANT_B);

	if (rate->ant == ANT_A)

drivers/net/wireless/iwlwifi/mvm/rs.h

+0 −2
Original line number Diff line number Diff line
@@ -322,8 +322,6 @@ struct iwl_lq_sta { 
	struct iwl_scale_tbl_info lq_info[LQ_SIZE]; /* "active", "search" */

	u8 tx_agg_tid_en;



	/* used to be in sta_info */

	int last_txrate_idx;

	/* last tx rate_n_flags */

	u32 last_rate_n_flags;

	/* packets destined for this STA are aggregated */