ath9k: Move regulatory information to a separate structure

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / ath9k / regd.h

diff --git a/drivers/net/wireless/ath9k/regd.h b/drivers/net/wireless/ath9k/regd.h
index ba2d2dfb0d1f0aae1f4f4785ff8a05ff67dc1832..65abdf46115d51aa786513b0aaa967f361dd2ca5 100644 (file)
--- a/drivers/net/wireless/ath9k/regd.h
+++ b/drivers/net/wireless/ath9k/regd.h
@@ -17,8 +17,6 @@
 #ifndef REGD_H
 #define REGD_H
 
-#include "ath9k.h"
-
 #define COUNTRY_ERD_FLAG        0x8000
 #define WORLDWIDE_ROAMING_FLAG  0x4000
 
@@ -47,6 +45,18 @@ struct country_code_to_enum_rd {
        const char *isoName;
 };
 
+struct ath9k_regulatory {
+       char alpha2[2];
+       u16 country_code;
+       u16 max_power_level;
+       u32 tp_scale;
+       u16 current_rd;
+       u16 current_rd_ext;
+       u16 current_rd_inuse;
+       int16_t power_limit;
+       struct reg_dmn_pair_mapping *regpair;
+};
+
 enum CountryCode {
        CTRY_ALBANIA = 8,
        CTRY_ALGERIA = 12,
@@ -229,6 +239,16 @@ enum CountryCode {
        CTRY_BELGIUM2 = 5002
 };
 
+u16 ath9k_regd_get_rd(struct ath_hal *ah);
+bool ath9k_is_world_regd(struct ath_hal *ah);
+const struct ieee80211_regdomain *ath9k_world_regdomain(struct ath_hal *ah);
+const struct ieee80211_regdomain *ath9k_default_world_regdomain(void);
+void ath9k_reg_apply_world_flags(struct wiphy *wiphy, enum reg_set_by setby);
+void ath9k_reg_apply_radar_flags(struct wiphy *wiphy);
+int ath9k_regd_init(struct ath_hal *ah);
+bool ath9k_regd_is_eeprom_valid(struct ath_hal *ah);
+u32 ath9k_regd_get_ctl(struct ath_hal *ah, struct ath9k_channel *chan);
+int ath9k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);
 void ath9k_regd_get_current_country(struct ath_hal *ah,
                                    struct ath9k_country_entry *ctry);