Skip to content

Commit 1a91931

Browse files
committed
regulatory: code cleanup
Clean up various things like indentation, extra parentheses, too many/few line breaks, etc. Acked-by: Luis R. Rodriguez <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
1 parent 75e2dba commit 1a91931

File tree

4 files changed

+116
-195
lines changed

4 files changed

+116
-195
lines changed

net/wireless/nl80211.c

+6-9
Original file line numberDiff line numberDiff line change
@@ -4259,7 +4259,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
42594259
dfs_region = nla_get_u8(info->attrs[NL80211_ATTR_DFS_REGION]);
42604260

42614261
nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
4262-
rem_reg_rules) {
4262+
rem_reg_rules) {
42634263
num_rules++;
42644264
if (num_rules > NL80211_MAX_SUPP_REG_RULES)
42654265
return -EINVAL;
@@ -4273,7 +4273,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
42734273
}
42744274

42754275
size_of_regd = sizeof(struct ieee80211_regdomain) +
4276-
(num_rules * sizeof(struct ieee80211_reg_rule));
4276+
num_rules * sizeof(struct ieee80211_reg_rule);
42774277

42784278
rd = kzalloc(size_of_regd, GFP_KERNEL);
42794279
if (!rd) {
@@ -4293,10 +4293,10 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
42934293
rd->dfs_region = dfs_region;
42944294

42954295
nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
4296-
rem_reg_rules) {
4296+
rem_reg_rules) {
42974297
nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
4298-
nla_data(nl_reg_rule), nla_len(nl_reg_rule),
4299-
reg_rule_policy);
4298+
nla_data(nl_reg_rule), nla_len(nl_reg_rule),
4299+
reg_rule_policy);
43004300
r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
43014301
if (r)
43024302
goto bad_reg;
@@ -4312,10 +4312,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
43124312
BUG_ON(rule_idx != num_rules);
43134313

43144314
r = set_regdom(rd);
4315-
4316-
mutex_unlock(&cfg80211_mutex);
4317-
4318-
return r;
4315+
rd = NULL;
43194316

43204317
bad_reg:
43214318
mutex_unlock(&cfg80211_mutex);

0 commit comments

Comments
 (0)