aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-12-03 11:21:11 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-01-03 07:01:22 -0500
commit1a9193185f462a51815fe48491f8a6fb6b942551 (patch)
tree9c89b47fdecbbd005fa5795393fab31e6a2e6e97 /net/wireless/nl80211.c
parent75e2dba866706ab9b133983b7fd9a6297b24c22d (diff)
regulatory: code cleanup
Clean up various things like indentation, extra parentheses, too many/few line breaks, etc. Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r--net/wireless/nl80211.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f45706adaf34..a19583cf4b6e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4259,7 +4259,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
4259 dfs_region = nla_get_u8(info->attrs[NL80211_ATTR_DFS_REGION]); 4259 dfs_region = nla_get_u8(info->attrs[NL80211_ATTR_DFS_REGION]);
4260 4260
4261 nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES], 4261 nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
4262 rem_reg_rules) { 4262 rem_reg_rules) {
4263 num_rules++; 4263 num_rules++;
4264 if (num_rules > NL80211_MAX_SUPP_REG_RULES) 4264 if (num_rules > NL80211_MAX_SUPP_REG_RULES)
4265 return -EINVAL; 4265 return -EINVAL;
@@ -4273,7 +4273,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
4273 } 4273 }
4274 4274
4275 size_of_regd = sizeof(struct ieee80211_regdomain) + 4275 size_of_regd = sizeof(struct ieee80211_regdomain) +
4276 (num_rules * sizeof(struct ieee80211_reg_rule)); 4276 num_rules * sizeof(struct ieee80211_reg_rule);
4277 4277
4278 rd = kzalloc(size_of_regd, GFP_KERNEL); 4278 rd = kzalloc(size_of_regd, GFP_KERNEL);
4279 if (!rd) { 4279 if (!rd) {
@@ -4293,10 +4293,10 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
4293 rd->dfs_region = dfs_region; 4293 rd->dfs_region = dfs_region;
4294 4294
4295 nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES], 4295 nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
4296 rem_reg_rules) { 4296 rem_reg_rules) {
4297 nla_parse(tb, NL80211_REG_RULE_ATTR_MAX, 4297 nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
4298 nla_data(nl_reg_rule), nla_len(nl_reg_rule), 4298 nla_data(nl_reg_rule), nla_len(nl_reg_rule),
4299 reg_rule_policy); 4299 reg_rule_policy);
4300 r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]); 4300 r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
4301 if (r) 4301 if (r)
4302 goto bad_reg; 4302 goto bad_reg;
@@ -4312,10 +4312,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
4312 BUG_ON(rule_idx != num_rules); 4312 BUG_ON(rule_idx != num_rules);
4313 4313
4314 r = set_regdom(rd); 4314 r = set_regdom(rd);
4315 4315 rd = NULL;
4316 mutex_unlock(&cfg80211_mutex);
4317
4318 return r;
4319 4316
4320 bad_reg: 4317 bad_reg:
4321 mutex_unlock(&cfg80211_mutex); 4318 mutex_unlock(&cfg80211_mutex);