Commit 1a919318 authored by Johannes Berg's avatar Johannes Berg

regulatory: code cleanup

Clean up various things like indentation, extra
parentheses, too many/few line breaks, etc.
Acked-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 75e2dba8
...@@ -4273,7 +4273,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info) ...@@ -4273,7 +4273,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
} }
size_of_regd = sizeof(struct ieee80211_regdomain) + size_of_regd = sizeof(struct ieee80211_regdomain) +
(num_rules * sizeof(struct ieee80211_reg_rule)); num_rules * sizeof(struct ieee80211_reg_rule);
rd = kzalloc(size_of_regd, GFP_KERNEL); rd = kzalloc(size_of_regd, GFP_KERNEL);
if (!rd) { if (!rd) {
...@@ -4312,10 +4312,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info) ...@@ -4312,10 +4312,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
BUG_ON(rule_idx != num_rules); BUG_ON(rule_idx != num_rules);
r = set_regdom(rd); r = set_regdom(rd);
rd = NULL;
mutex_unlock(&cfg80211_mutex);
return r;
bad_reg: bad_reg:
mutex_unlock(&cfg80211_mutex); mutex_unlock(&cfg80211_mutex);
......
This diff is collapsed.
...@@ -519,10 +519,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, ...@@ -519,10 +519,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
* - country_ie + 2, the start of the country ie data, and * - country_ie + 2, the start of the country ie data, and
* - and country_ie[1] which is the IE length * - and country_ie[1] which is the IE length
*/ */
regulatory_hint_11d(wdev->wiphy, regulatory_hint_11d(wdev->wiphy, bss->channel->band,
bss->channel->band, country_ie + 2, country_ie[1]);
country_ie + 2,
country_ie[1]);
kfree(country_ie); kfree(country_ie);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment