[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: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index edcc542c3b342df752e7b235021267a6d76474f0..86e650dbddff605e45c8e4e0c361a3a69e945279 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -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++)