Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d94c157 authored by Stanislav Yakovlev's avatar Stanislav Yakovlev Committed by John W. Linville
Browse files

ipw2x00: remove ipw2100_rates_11b[] 



It's just a duplicate of ipw2100_bg_rates[].

Signed-off-by: default avatarStanislav Yakovlev <stas.yakovlev@gmail.com>
Reviewed-by: default avatarJulian Calaby <julian.calaby@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 02f1434d

drivers/net/wireless/ipw2x00/ipw2100.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -309,13 +309,6 @@ static const long ipw2100_frequencies[] = { 




#define FREQ_COUNT	ARRAY_SIZE(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[] = {

static struct ieee80211_rate ipw2100_bg_rates[] = {

	{ .bitrate = 10 },

	{ .bitrate = 10 },

	{ .bitrate = 20, .flags = IEEE80211_RATE_SHORT_PREAMBLE },

	{ .bitrate = 20, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
@@ -323,7 +316,7 @@ static struct ieee80211_rate ipw2100_bg_rates[] = { 
	{ .bitrate = 110, .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 */

/* 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);

static void ipw2100_tx_send_commands(struct ipw2100_priv *priv);
@@ -6896,7 +6889,7 @@ static int ipw2100_wx_get_range(struct net_device *dev, 
	range->num_bitrates = RATE_COUNT;

	range->num_bitrates = RATE_COUNT;





	for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) {

	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;

	range->min_rts = MIN_RTS_THRESHOLD;