diff options
author | Colin McCabe <colin@cozybit.com> | 2008-12-01 16:38:55 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-12-05 09:35:47 -0500 |
commit | d97809dbbf1b8a6df79c82be75fa0cababec783b (patch) | |
tree | eadd628167157a49384b7c7297ac3fbabd325863 /drivers/net/wireless/ath9k/ath9k.h | |
parent | 33fd8195529d74c0fe23cddd1c76fe7e03bbd324 (diff) |
ath9k: Replace ath9k_opmode with nl80211_iftype
This patch kills ath9k's ath9k_opmode enum by replacing it with nl80211_iftype.
Signed-off-by: Colin McCabe <colin@cozybit.com>
Signed-off-by: Andrey Yurovsky <andrey@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/ath9k.h')
-rw-r--r-- | drivers/net/wireless/ath9k/ath9k.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h index 9eaa3fce631c..9520aa0898e3 100644 --- a/drivers/net/wireless/ath9k/ath9k.h +++ b/drivers/net/wireless/ath9k/ath9k.h | |||
@@ -647,13 +647,6 @@ enum ath9k_ant_setting { | |||
647 | ATH9K_ANT_FIXED_B | 647 | ATH9K_ANT_FIXED_B |
648 | }; | 648 | }; |
649 | 649 | ||
650 | enum ath9k_opmode { | ||
651 | ATH9K_M_STA = 1, | ||
652 | ATH9K_M_IBSS = 0, | ||
653 | ATH9K_M_HOSTAP = 6, | ||
654 | ATH9K_M_MONITOR = 8 | ||
655 | }; | ||
656 | |||
657 | #define ATH9K_SLOT_TIME_6 6 | 650 | #define ATH9K_SLOT_TIME_6 6 |
658 | #define ATH9K_SLOT_TIME_9 9 | 651 | #define ATH9K_SLOT_TIME_9 9 |
659 | #define ATH9K_SLOT_TIME_20 20 | 652 | #define ATH9K_SLOT_TIME_20 20 |
@@ -780,7 +773,8 @@ struct ath_hal { | |||
780 | 773 | ||
781 | void __iomem *ah_sh; | 774 | void __iomem *ah_sh; |
782 | struct ath_softc *ah_sc; | 775 | struct ath_softc *ah_sc; |
783 | enum ath9k_opmode ah_opmode; | 776 | |
777 | enum nl80211_iftype ah_opmode; | ||
784 | struct ath9k_ops_config ah_config; | 778 | struct ath9k_ops_config ah_config; |
785 | struct ath9k_hw_capabilities ah_caps; | 779 | struct ath9k_hw_capabilities ah_caps; |
786 | 780 | ||