diff options
Diffstat (limited to 'drivers/net/wireless/ath/regd.h')
-rw-r--r-- | drivers/net/wireless/ath/regd.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h index 07291ccb23f2..4d3c53674e5a 100644 --- a/drivers/net/wireless/ath/regd.h +++ b/drivers/net/wireless/ath/regd.h | |||
@@ -18,9 +18,10 @@ | |||
18 | #define REGD_H | 18 | #define REGD_H |
19 | 19 | ||
20 | #include <linux/nl80211.h> | 20 | #include <linux/nl80211.h> |
21 | |||
22 | #include <net/cfg80211.h> | 21 | #include <net/cfg80211.h> |
23 | 22 | ||
23 | #include "ath.h" | ||
24 | |||
24 | #define NO_CTL 0xff | 25 | #define NO_CTL 0xff |
25 | #define SD_NO_CTL 0xE0 | 26 | #define SD_NO_CTL 0xE0 |
26 | #define NO_CTL 0xff | 27 | #define NO_CTL 0xff |
@@ -47,29 +48,12 @@ | |||
47 | #define CHANNEL_HALF_BW 10 | 48 | #define CHANNEL_HALF_BW 10 |
48 | #define CHANNEL_QUARTER_BW 5 | 49 | #define CHANNEL_QUARTER_BW 5 |
49 | 50 | ||
50 | struct reg_dmn_pair_mapping { | ||
51 | u16 regDmnEnum; | ||
52 | u16 reg_5ghz_ctl; | ||
53 | u16 reg_2ghz_ctl; | ||
54 | }; | ||
55 | |||
56 | struct country_code_to_enum_rd { | 51 | struct country_code_to_enum_rd { |
57 | u16 countryCode; | 52 | u16 countryCode; |
58 | u16 regDmnEnum; | 53 | u16 regDmnEnum; |
59 | const char *isoName; | 54 | const char *isoName; |
60 | }; | 55 | }; |
61 | 56 | ||
62 | struct ath_regulatory { | ||
63 | char alpha2[2]; | ||
64 | u16 country_code; | ||
65 | u16 max_power_level; | ||
66 | u32 tp_scale; | ||
67 | u16 current_rd; | ||
68 | u16 current_rd_ext; | ||
69 | int16_t power_limit; | ||
70 | struct reg_dmn_pair_mapping *regpair; | ||
71 | }; | ||
72 | |||
73 | enum CountryCode { | 57 | enum CountryCode { |
74 | CTRY_ALBANIA = 8, | 58 | CTRY_ALBANIA = 8, |
75 | CTRY_ALGERIA = 12, | 59 | CTRY_ALGERIA = 12, |