aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-11-01 19:36:40 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-11-21 11:06:05 -0500
commit3d8606a680529d41ad8985f36ecf83a7b393ecaf (patch)
tree4deeffbd9f3ddaba1b99e8f8a2c32bff90fbcfd9 /drivers/net/wireless/rt2x00
parent1c740ed2210a0d124674a477ea538468aba47810 (diff)
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: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c14
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00lib.h1
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 477a944167c4..a8fee68a419e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -717,31 +717,31 @@ EXPORT_SYMBOL_GPL(rt2x00lib_rxdone);
717 */ 717 */
718const struct rt2x00_rate rt2x00_supported_rates[12] = { 718const struct rt2x00_rate rt2x00_supported_rates[12] = {
719 { 719 {
720 .flags = DEV_RATE_CCK | DEV_RATE_BASIC, 720 .flags = DEV_RATE_CCK,
721 .bitrate = 10, 721 .bitrate = 10,
722 .ratemask = BIT(0), 722 .ratemask = BIT(0),
723 .plcp = 0x00, 723 .plcp = 0x00,
724 }, 724 },
725 { 725 {
726 .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC, 726 .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE,
727 .bitrate = 20, 727 .bitrate = 20,
728 .ratemask = BIT(1), 728 .ratemask = BIT(1),
729 .plcp = 0x01, 729 .plcp = 0x01,
730 }, 730 },
731 { 731 {
732 .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC, 732 .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE,
733 .bitrate = 55, 733 .bitrate = 55,
734 .ratemask = BIT(2), 734 .ratemask = BIT(2),
735 .plcp = 0x02, 735 .plcp = 0x02,
736 }, 736 },
737 { 737 {
738 .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC, 738 .flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE,
739 .bitrate = 110, 739 .bitrate = 110,
740 .ratemask = BIT(3), 740 .ratemask = BIT(3),
741 .plcp = 0x03, 741 .plcp = 0x03,
742 }, 742 },
743 { 743 {
744 .flags = DEV_RATE_OFDM | DEV_RATE_BASIC, 744 .flags = DEV_RATE_OFDM,
745 .bitrate = 60, 745 .bitrate = 60,
746 .ratemask = BIT(4), 746 .ratemask = BIT(4),
747 .plcp = 0x0b, 747 .plcp = 0x0b,
@@ -753,7 +753,7 @@ const struct rt2x00_rate rt2x00_supported_rates[12] = {
753 .plcp = 0x0f, 753 .plcp = 0x0f,
754 }, 754 },
755 { 755 {
756 .flags = DEV_RATE_OFDM | DEV_RATE_BASIC, 756 .flags = DEV_RATE_OFDM,
757 .bitrate = 120, 757 .bitrate = 120,
758 .ratemask = BIT(6), 758 .ratemask = BIT(6),
759 .plcp = 0x0a, 759 .plcp = 0x0a,
@@ -765,7 +765,7 @@ const struct rt2x00_rate rt2x00_supported_rates[12] = {
765 .plcp = 0x0e, 765 .plcp = 0x0e,
766 }, 766 },
767 { 767 {
768 .flags = DEV_RATE_OFDM | DEV_RATE_BASIC, 768 .flags = DEV_RATE_OFDM,
769 .bitrate = 240, 769 .bitrate = 240,
770 .ratemask = BIT(8), 770 .ratemask = BIT(8),
771 .plcp = 0x09, 771 .plcp = 0x09,
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 9f214f89ba6d..c52ee218e4f5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -43,7 +43,6 @@ struct rt2x00_rate {
43#define DEV_RATE_CCK 0x0001 43#define DEV_RATE_CCK 0x0001
44#define DEV_RATE_OFDM 0x0002 44#define DEV_RATE_OFDM 0x0002
45#define DEV_RATE_SHORT_PREAMBLE 0x0004 45#define DEV_RATE_SHORT_PREAMBLE 0x0004
46#define DEV_RATE_BASIC 0x0008
47 46
48 unsigned short bitrate; /* In 100kbit/s */ 47 unsigned short bitrate; /* In 100kbit/s */
49 unsigned short ratemask; 48 unsigned short ratemask;