Commit 3d8606a6 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville

rt2x00: Remove RATE_BASIC flag

mac80211 is in charge of determining the basic rates,
so we are not using the RATE_BASIC flag anymore.
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1c740ed2
...@@ -717,31 +717,31 @@ EXPORT_SYMBOL_GPL(rt2x00lib_rxdone); ...@@ -717,31 +717,31 @@ EXPORT_SYMBOL_GPL(rt2x00lib_rxdone);
*/ */
const struct rt2x00_rate rt2x00_supported_rates[12] = { const struct rt2x00_rate rt2x00_supported_rates[12] = {
{ {
.flags = DEV_RATE_CCK | DEV_RATE_BASIC, .flags = DEV_RATE_CCK,
.bitrate = 10, .bitrate = 10,
.ratemask = BIT(0), .ratemask = BIT(0),
.plcp = 0x00, .plcp = 0x00,
}, },
{ {
.flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC, .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE,
.bitrate = 20, .bitrate = 20,
.ratemask = BIT(1), .ratemask = BIT(1),
.plcp = 0x01, .plcp = 0x01,
}, },
{ {
.flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC, .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE,
.bitrate = 55, .bitrate = 55,
.ratemask = BIT(2), .ratemask = BIT(2),
.plcp = 0x02, .plcp = 0x02,
}, },
{ {
.flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC, .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE,
.bitrate = 110, .bitrate = 110,
.ratemask = BIT(3), .ratemask = BIT(3),
.plcp = 0x03, .plcp = 0x03,
}, },
{ {
.flags = DEV_RATE_OFDM | DEV_RATE_BASIC, .flags = DEV_RATE_OFDM,
.bitrate = 60, .bitrate = 60,
.ratemask = BIT(4), .ratemask = BIT(4),
.plcp = 0x0b, .plcp = 0x0b,
...@@ -753,7 +753,7 @@ const struct rt2x00_rate rt2x00_supported_rates[12] = { ...@@ -753,7 +753,7 @@ const struct rt2x00_rate rt2x00_supported_rates[12] = {
.plcp = 0x0f, .plcp = 0x0f,
}, },
{ {
.flags = DEV_RATE_OFDM | DEV_RATE_BASIC, .flags = DEV_RATE_OFDM,
.bitrate = 120, .bitrate = 120,
.ratemask = BIT(6), .ratemask = BIT(6),
.plcp = 0x0a, .plcp = 0x0a,
...@@ -765,7 +765,7 @@ const struct rt2x00_rate rt2x00_supported_rates[12] = { ...@@ -765,7 +765,7 @@ const struct rt2x00_rate rt2x00_supported_rates[12] = {
.plcp = 0x0e, .plcp = 0x0e,
}, },
{ {
.flags = DEV_RATE_OFDM | DEV_RATE_BASIC, .flags = DEV_RATE_OFDM,
.bitrate = 240, .bitrate = 240,
.ratemask = BIT(8), .ratemask = BIT(8),
.plcp = 0x09, .plcp = 0x09,
......
...@@ -43,7 +43,6 @@ struct rt2x00_rate { ...@@ -43,7 +43,6 @@ struct rt2x00_rate {
#define DEV_RATE_CCK 0x0001 #define DEV_RATE_CCK 0x0001
#define DEV_RATE_OFDM 0x0002 #define DEV_RATE_OFDM 0x0002
#define DEV_RATE_SHORT_PREAMBLE 0x0004 #define DEV_RATE_SHORT_PREAMBLE 0x0004
#define DEV_RATE_BASIC 0x0008
unsigned short bitrate; /* In 100kbit/s */ unsigned short bitrate; /* In 100kbit/s */
unsigned short ratemask; unsigned short ratemask;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment