Skip to content

Commit

Permalink
ipw2x00: remove ipw2100_rates_11b[]
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stanislav Yakovlev authored and John W. Linville committed Feb 29, 2012
1 parent 02f1434 commit 4d94c15
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/net/wireless/ipw2x00/ipw2100.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,21 +309,14 @@ static const long ipw2100_frequencies[] = {

#define FREQ_COUNT ARRAY_SIZE(ipw2100_frequencies)

static const long ipw2100_rates_11b[] = {
1000000,
2000000,
5500000,
11000000
};

static struct ieee80211_rate ipw2100_bg_rates[] = {
{ .bitrate = 10 },
{ .bitrate = 20, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
{ .bitrate = 55, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
{ .bitrate = 110, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
};

#define RATE_COUNT ARRAY_SIZE(ipw2100_rates_11b)
#define RATE_COUNT ARRAY_SIZE(ipw2100_bg_rates)

/* Pre-decl until we get the code solid and then we can clean it up */
static void ipw2100_tx_send_commands(struct ipw2100_priv *priv);
Expand Down Expand Up @@ -6896,7 +6889,7 @@ static int ipw2100_wx_get_range(struct net_device *dev,
range->num_bitrates = RATE_COUNT;

for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) {
range->bitrate[i] = ipw2100_rates_11b[i];
range->bitrate[i] = ipw2100_bg_rates[i].bitrate * 100 * 1000;
}

range->min_rts = MIN_RTS_THRESHOLD;
Expand Down

0 comments on commit 4d94c15

Please sign in to comment.