diff options
author | Zhu Yi <yi.zhu@intel.com> | 2007-09-26 23:27:36 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:53:23 -0400 |
commit | 63fddb9f7f65b41277043344ae0d24dbbb451ada (patch) | |
tree | 463a46da56fee91d4afc23369485fa0f7a482eda /drivers/net | |
parent | c14c521e440a6a83835a2879a4c5f4311b1df68f (diff) |
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c index edcc542c3b34..86e650dbddff 100644 --- 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) | |||
1776 | 1776 | ||
1777 | if (crl == NULL) | 1777 | if (crl == NULL) |
1778 | return NULL; | 1778 | return NULL; |
1779 | |||
1780 | memset(crl, 0, sizeof(struct iwl_rate_scale_priv)); | ||
1781 | crl->lq.sta_id = 0xff; | 1779 | crl->lq.sta_id = 0xff; |
1782 | 1780 | ||
1781 | |||
1783 | for (j = 0; j < LQ_SIZE; j++) | 1782 | for (j = 0; j < LQ_SIZE; j++) |
1784 | for (i = 0; i < IWL_RATE_COUNT; i++) | 1783 | for (i = 0; i < IWL_RATE_COUNT; i++) |
1785 | rs_rate_scale_clear_window(&(crl->lq_info[j].win[i])); | 1784 | 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, | |||
1796 | struct iwl_priv *priv = (struct iwl_priv *)priv_rate; | 1795 | struct iwl_priv *priv = (struct iwl_priv *)priv_rate; |
1797 | struct iwl_rate_scale_priv *crl = priv_sta; | 1796 | struct iwl_rate_scale_priv *crl = priv_sta; |
1798 | 1797 | ||
1799 | memset(crl, 0, sizeof(struct iwl_rate_scale_priv)); | ||
1800 | |||
1801 | crl->lq.sta_id = 0xff; | ||
1802 | crl->flush_timer = 0; | 1798 | crl->flush_timer = 0; |
1803 | sta->txrate = 3; | 1799 | sta->txrate = 3; |
1804 | for (j = 0; j < LQ_SIZE; j++) | 1800 | for (j = 0; j < LQ_SIZE; j++) |