diff options
author | Stanislav Yakovlev <stas.yakovlev@gmail.com> | 2012-02-09 20:23:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-29 14:11:33 -0500 |
commit | 4d94c157f87eebdcd84e9e5e27ad65978f776c2e (patch) | |
tree | a6a11524492f71f6cf208c83c10c56e2a69ccd5a /drivers/net/wireless/ipw2x00 | |
parent | 02f1434d4ed8197cefde6f6c4a8b2f502144cbb5 (diff) |
ipw2x00: remove ipw2100_rates_11b[]
It's just a duplicate of ipw2100_bg_rates[].
Signed-off-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index da41b8cf8700..5d7e97e63def 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -309,13 +309,6 @@ static const long ipw2100_frequencies[] = { | |||
309 | 309 | ||
310 | #define FREQ_COUNT ARRAY_SIZE(ipw2100_frequencies) | 310 | #define FREQ_COUNT ARRAY_SIZE(ipw2100_frequencies) |
311 | 311 | ||
312 | static const long ipw2100_rates_11b[] = { | ||
313 | 1000000, | ||
314 | 2000000, | ||
315 | 5500000, | ||
316 | 11000000 | ||
317 | }; | ||
318 | |||
319 | static struct ieee80211_rate ipw2100_bg_rates[] = { | 312 | static struct ieee80211_rate ipw2100_bg_rates[] = { |
320 | { .bitrate = 10 }, | 313 | { .bitrate = 10 }, |
321 | { .bitrate = 20, .flags = IEEE80211_RATE_SHORT_PREAMBLE }, | 314 | { .bitrate = 20, .flags = IEEE80211_RATE_SHORT_PREAMBLE }, |
@@ -323,7 +316,7 @@ static struct ieee80211_rate ipw2100_bg_rates[] = { | |||
323 | { .bitrate = 110, .flags = IEEE80211_RATE_SHORT_PREAMBLE }, | 316 | { .bitrate = 110, .flags = IEEE80211_RATE_SHORT_PREAMBLE }, |
324 | }; | 317 | }; |
325 | 318 | ||
326 | #define RATE_COUNT ARRAY_SIZE(ipw2100_rates_11b) | 319 | #define RATE_COUNT ARRAY_SIZE(ipw2100_bg_rates) |
327 | 320 | ||
328 | /* Pre-decl until we get the code solid and then we can clean it up */ | 321 | /* Pre-decl until we get the code solid and then we can clean it up */ |
329 | static void ipw2100_tx_send_commands(struct ipw2100_priv *priv); | 322 | static void ipw2100_tx_send_commands(struct ipw2100_priv *priv); |
@@ -6896,7 +6889,7 @@ static int ipw2100_wx_get_range(struct net_device *dev, | |||
6896 | range->num_bitrates = RATE_COUNT; | 6889 | range->num_bitrates = RATE_COUNT; |
6897 | 6890 | ||
6898 | for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) { | 6891 | for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) { |
6899 | range->bitrate[i] = ipw2100_rates_11b[i]; | 6892 | range->bitrate[i] = ipw2100_bg_rates[i].bitrate * 100 * 1000; |
6900 | } | 6893 | } |
6901 | 6894 | ||
6902 | range->min_rts = MIN_RTS_THRESHOLD; | 6895 | range->min_rts = MIN_RTS_THRESHOLD; |