diff options
author | Nick Kossifidis <mickflemm@gmail.com> | 2010-11-23 14:49:53 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-30 13:53:45 -0500 |
commit | acb091d67c5c9649cf5d25055ef6fd64239a6762 (patch) | |
tree | 43c2df5f954cd28c6917709496d269296d22f658 /drivers/net/wireless/ath/ath5k/ath5k.h | |
parent | 73a06a683455f472cc09ad249064c66a41e29e39 (diff) |
ath5k: Cleanup turbo channel flags
* Clean up CHANNEL_T(URBO), use AR5K_BWMODE_40MHZ instead
Signed-off-by: Nick Kossifidis <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/ath5k.h')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/ath5k.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h index 385b91911ab..81ad236932c 100644 --- a/drivers/net/wireless/ath/ath5k/ath5k.h +++ b/drivers/net/wireless/ath/ath5k/ath5k.h | |||
@@ -686,7 +686,6 @@ struct ath5k_gain { | |||
686 | 686 | ||
687 | /* channel_flags */ | 687 | /* channel_flags */ |
688 | #define CHANNEL_CW_INT 0x0008 /* Contention Window interference detected */ | 688 | #define CHANNEL_CW_INT 0x0008 /* Contention Window interference detected */ |
689 | #define CHANNEL_TURBO 0x0010 /* Turbo Channel */ | ||
690 | #define CHANNEL_CCK 0x0020 /* CCK channel */ | 689 | #define CHANNEL_CCK 0x0020 /* CCK channel */ |
691 | #define CHANNEL_OFDM 0x0040 /* OFDM channel */ | 690 | #define CHANNEL_OFDM 0x0040 /* OFDM channel */ |
692 | #define CHANNEL_2GHZ 0x0080 /* 2GHz channel. */ | 691 | #define CHANNEL_2GHZ 0x0080 /* 2GHz channel. */ |
@@ -698,16 +697,10 @@ struct ath5k_gain { | |||
698 | #define CHANNEL_A (CHANNEL_5GHZ|CHANNEL_OFDM) | 697 | #define CHANNEL_A (CHANNEL_5GHZ|CHANNEL_OFDM) |
699 | #define CHANNEL_B (CHANNEL_2GHZ|CHANNEL_CCK) | 698 | #define CHANNEL_B (CHANNEL_2GHZ|CHANNEL_CCK) |
700 | #define CHANNEL_G (CHANNEL_2GHZ|CHANNEL_OFDM) | 699 | #define CHANNEL_G (CHANNEL_2GHZ|CHANNEL_OFDM) |
701 | #define CHANNEL_T (CHANNEL_5GHZ|CHANNEL_OFDM|CHANNEL_TURBO) | ||
702 | #define CHANNEL_TG (CHANNEL_2GHZ|CHANNEL_OFDM|CHANNEL_TURBO) | ||
703 | #define CHANNEL_108A CHANNEL_T | ||
704 | #define CHANNEL_108G CHANNEL_TG | ||
705 | #define CHANNEL_X (CHANNEL_5GHZ|CHANNEL_OFDM|CHANNEL_XR) | 700 | #define CHANNEL_X (CHANNEL_5GHZ|CHANNEL_OFDM|CHANNEL_XR) |
706 | 701 | ||
707 | #define CHANNEL_ALL (CHANNEL_OFDM|CHANNEL_CCK|CHANNEL_2GHZ|CHANNEL_5GHZ| \ | 702 | #define CHANNEL_ALL (CHANNEL_OFDM|CHANNEL_CCK|CHANNEL_2GHZ|CHANNEL_5GHZ) |
708 | CHANNEL_TURBO) | ||
709 | 703 | ||
710 | #define CHANNEL_ALL_NOTURBO (CHANNEL_ALL & ~CHANNEL_TURBO) | ||
711 | #define CHANNEL_MODES CHANNEL_ALL | 704 | #define CHANNEL_MODES CHANNEL_ALL |
712 | 705 | ||
713 | /* | 706 | /* |