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>
This commit is contained in:
committed by
John W. Linville
parent
762af43bda
commit
734366deae
@@ -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 */
|
||||
|
Reference in New Issue
Block a user