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

Commit 63fddb9f authored by Zhu Yi's avatar Zhu Yi Committed by David S. Miller
Browse files

[PATCH] iwlwifi: removing unnecessary memset in 4965 rate scale 



This patch removes redundant memset in rate scale. In rs_alloc_sta,
kzalloc is used so the memset can be avoided. In rs_rate_init, it is
a bug fix since it overrides everything set in other handlers namely
add_debugfs.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c14c521e

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

+1 −5
Original line number Diff line number Diff line
@@ -1776,10 +1776,9 @@ static void *rs_alloc_sta(void *priv, gfp_t gfp) 


	if (crl == NULL)

		return NULL;



	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));

	crl->lq.sta_id = 0xff;





	for (j = 0; j < LQ_SIZE; j++)

		for (i = 0; i < IWL_RATE_COUNT; i++)

			rs_rate_scale_clear_window(&(crl->lq_info[j].win[i]));
@@ -1796,9 +1795,6 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, 
	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;

	struct iwl_rate_scale_priv *crl = priv_sta;



	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));



	crl->lq.sta_id = 0xff;

	crl->flush_timer = 0;

	sta->txrate = 3;

	for (j = 0; j < LQ_SIZE; j++)