diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-12-02 14:25:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-12-02 14:25:38 -0500 |
commit | 4b074b07625f603d40d4d04937f8874a00415dc4 (patch) | |
tree | 2dffdc46e3fea0320524f483cf5ac2c058ab59f2 /net/wireless/reg.h | |
parent | 7d68849f40cd9169088249cc889d95c8998c3fb8 (diff) | |
parent | ddcc347b70f298f9d624cd0e250581d831d915fb (diff) | |
download | linux-stable-4b074b07625f603d40d4d04937f8874a00415dc4.tar.gz linux-stable-4b074b07625f603d40d4d04937f8874a00415dc4.tar.bz2 linux-stable-4b074b07625f603d40d4d04937f8874a00415dc4.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/wireless/reg.h')
-rw-r--r-- | net/wireless/reg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/reg.h b/net/wireless/reg.h index 9677e3c13da9..cc4c2c0a6723 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h @@ -18,8 +18,9 @@ extern const struct ieee80211_regdomain __rcu *cfg80211_regdomain; +bool reg_is_valid_request(const char *alpha2); bool is_world_regdom(const char *alpha2); -bool reg_supported_dfs_region(u8 dfs_region); +bool reg_supported_dfs_region(enum nl80211_dfs_regions dfs_region); int regulatory_hint_user(const char *alpha2, enum nl80211_user_reg_hint_type user_reg_hint_type); |