diff options
author | Dan Carpenter <error27@gmail.com> | 2010-03-28 07:55:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-26 10:47:48 -0400 |
commit | 2596e91190508f987871ad58589adb6016668b87 (patch) | |
tree | 521071e0b3dff49f470117b07491a936c698fd0a | |
parent | 82ebe78ace38cfc37d16166fcff7ff3064e7460b (diff) |
iwlwifi: range checking issue
commit 8e1a53c615e8efe0fac670f2973da64758748a8a upstream.
IWL_RATE_COUNT is 13 and IWL_RATE_COUNT_LEGACY is 12.
IWL_RATE_COUNT_LEGACY is the right one here because iwl3945_rates
doesn't support 60M and also that's how "rates" is defined in
iwlcore_init_geos() from drivers/net/wireless/iwlwifi/iwl-core.c.
rates = kzalloc((sizeof(struct ieee80211_rate) * IWL_RATE_COUNT_LEGACY),
GFP_KERNEL);
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 7e5d4ee674e4..adbb3ea4d865 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -1926,7 +1926,7 @@ static void iwl3945_init_hw_rates(struct iwl_priv *priv, | |||
1926 | { | 1926 | { |
1927 | int i; | 1927 | int i; |
1928 | 1928 | ||
1929 | for (i = 0; i < IWL_RATE_COUNT; i++) { | 1929 | for (i = 0; i < IWL_RATE_COUNT_LEGACY; i++) { |
1930 | rates[i].bitrate = iwl3945_rates[i].ieee * 5; | 1930 | rates[i].bitrate = iwl3945_rates[i].ieee * 5; |
1931 | rates[i].hw_value = i; /* Rate scaling will work on indexes */ | 1931 | rates[i].hw_value = i; /* Rate scaling will work on indexes */ |
1932 | rates[i].hw_value_short = i; | 1932 | rates[i].hw_value_short = i; |