summaryrefslogtreecommitdiffstats
path: root/net/wireless/reg.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-09-15 10:56:48 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-09-24 16:17:59 -0400
commit734366deaee05b1a5842d977960b4cc574d7551d (patch)
treee5cdf95f9c718f8b49872b83dcc8dbb459487c0a /net/wireless/reg.h
parent762af43bda3d8281a2738d3920ae5ded170aaf39 (diff)
downloadlinux-stable-734366deaee05b1a5842d977960b4cc574d7551d.tar.gz
linux-stable-734366deaee05b1a5842d977960b4cc574d7551d.tar.bz2
linux-stable-734366deaee05b1a5842d977960b4cc574d7551d.zip
cfg80211: clean up regulatory mess
The recent code from Luis is an #ifdef hell and contains lots of code that's stuffed into the wrong file making a whole bunch of things needlessly non-static, and besides, what is it doing in core.c?? Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/reg.h')
-rw-r--r--net/wireless/reg.h35
1 files changed, 2 insertions, 33 deletions
diff --git a/net/wireless/reg.h b/net/wireless/reg.h
index d75fd0232972..b169815987f4 100644
--- a/net/wireless/reg.h
+++ b/net/wireless/reg.h
@@ -1,44 +1,13 @@
#ifndef __NET_WIRELESS_REG_H
#define __NET_WIRELESS_REG_H
-extern const struct ieee80211_regdomain world_regdom;
-#ifdef CONFIG_WIRELESS_OLD_REGULATORY
-extern const struct ieee80211_regdomain us_regdom;
-extern const struct ieee80211_regdomain jp_regdom;
-extern const struct ieee80211_regdomain eu_regdom;
-#endif
-
-extern struct ieee80211_regdomain *cfg80211_regdomain;
-extern struct ieee80211_regdomain *cfg80211_world_regdom;
-extern struct list_head regulatory_requests;
-
-struct regdom_last_setby {
- struct wiphy *wiphy;
- u8 initiator;
-};
-
-/* wiphy is set if this request's initiator is REGDOM_SET_BY_DRIVER */
-struct regulatory_request {
- struct list_head list;
- struct wiphy *wiphy;
- int granted;
- enum reg_set_by initiator;
- char alpha2[2];
-};
-
+extern struct mutex cfg80211_reg_mutex;
bool is_world_regdom(char *alpha2);
bool reg_is_valid_request(char *alpha2);
-int set_regdom(struct ieee80211_regdomain *rd);
-int __regulatory_hint_alpha2(struct wiphy *wiphy, enum reg_set_by set_by,
- const char *alpha2);
-
int regulatory_init(void);
void regulatory_exit(void);
-void print_regdomain_info(struct ieee80211_regdomain *);
-
-/* If a char is A-Z */
-#define IS_ALPHA(letter) (letter >= 65 && letter <= 90)
+int set_regdom(struct ieee80211_regdomain *rd);
#endif /* __NET_WIRELESS_REG_H */