diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-11-13 12:54:02 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-11-25 14:52:12 -0500 |
commit | 4c7d3982a6e37831382b9ef90aa0dbadc0bf3a22 (patch) | |
tree | 4c27ee3a86f91783464daeb5353d11e22475dcff /net/wireless | |
parent | f7d8ad81ca8c447124821e58f876d1aff996c85f (diff) |
cfg80211: use enum nl80211_dfs_regions for dfs_region everywhere
u8 was used in some other places, just stick to the enum,
this forces us to express the values that are expected.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/nl80211.c | 2 | ||||
-rw-r--r-- | net/wireless/reg.c | 4 | ||||
-rw-r--r-- | net/wireless/reg.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 7b73132910b7..79632edebb6c 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -5079,7 +5079,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info) | |||
5079 | char *alpha2 = NULL; | 5079 | char *alpha2 = NULL; |
5080 | int rem_reg_rules = 0, r = 0; | 5080 | int rem_reg_rules = 0, r = 0; |
5081 | u32 num_rules = 0, rule_idx = 0, size_of_regd; | 5081 | u32 num_rules = 0, rule_idx = 0, size_of_regd; |
5082 | u8 dfs_region = 0; | 5082 | enum nl80211_dfs_regions dfs_region = NL80211_DFS_UNSET; |
5083 | struct ieee80211_regdomain *rd = NULL; | 5083 | struct ieee80211_regdomain *rd = NULL; |
5084 | 5084 | ||
5085 | if (!info->attrs[NL80211_ATTR_REG_ALPHA2]) | 5085 | if (!info->attrs[NL80211_ATTR_REG_ALPHA2]) |
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 067c1f63a1ae..2796b622890f 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -2115,7 +2115,7 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd) | |||
2115 | } | 2115 | } |
2116 | } | 2116 | } |
2117 | 2117 | ||
2118 | bool reg_supported_dfs_region(u8 dfs_region) | 2118 | bool reg_supported_dfs_region(enum nl80211_dfs_regions dfs_region) |
2119 | { | 2119 | { |
2120 | switch (dfs_region) { | 2120 | switch (dfs_region) { |
2121 | case NL80211_DFS_UNSET: | 2121 | case NL80211_DFS_UNSET: |
@@ -2130,7 +2130,7 @@ bool reg_supported_dfs_region(u8 dfs_region) | |||
2130 | } | 2130 | } |
2131 | } | 2131 | } |
2132 | 2132 | ||
2133 | static void print_dfs_region(u8 dfs_region) | 2133 | static void print_dfs_region(enum nl80211_dfs_regions dfs_region) |
2134 | { | 2134 | { |
2135 | if (!dfs_region) | 2135 | if (!dfs_region) |
2136 | return; | 2136 | return; |
diff --git a/net/wireless/reg.h b/net/wireless/reg.h index b4076babaf47..cc4c2c0a6723 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h | |||
@@ -20,7 +20,7 @@ extern const struct ieee80211_regdomain __rcu *cfg80211_regdomain; | |||
20 | 20 | ||
21 | bool reg_is_valid_request(const char *alpha2); | 21 | bool reg_is_valid_request(const char *alpha2); |
22 | bool is_world_regdom(const char *alpha2); | 22 | bool is_world_regdom(const char *alpha2); |
23 | bool reg_supported_dfs_region(u8 dfs_region); | 23 | bool reg_supported_dfs_region(enum nl80211_dfs_regions dfs_region); |
24 | 24 | ||
25 | int regulatory_hint_user(const char *alpha2, | 25 | int regulatory_hint_user(const char *alpha2, |
26 | enum nl80211_user_reg_hint_type user_reg_hint_type); | 26 | enum nl80211_user_reg_hint_type user_reg_hint_type); |