summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-11-28 14:54:31 +0100
committerJohannes Berg <johannes.berg@intel.com>2014-11-28 14:54:31 +0100
commitea372c5452651f1b65ee817cd3409d63f0699b35 (patch)
treef412a4656e255011e3cca695d13fc59f3702b847 /net/wireless
parentad932f046fbe9839479350e7b88082a7d1dea498 (diff)
downloadblackbird-op-linux-ea372c5452651f1b65ee817cd3409d63f0699b35.tar.gz
blackbird-op-linux-ea372c5452651f1b65ee817cd3409d63f0699b35.zip
cfg80211: remove unneeded initialisations in nl80211_set_reg
Some variables are assigned unconditionally, remove their initialisations to help avoid introducing errors later. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 4fae26d722f8..a17d6bc6b22c 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5422,11 +5422,11 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
{
struct nlattr *tb[NL80211_REG_RULE_ATTR_MAX + 1];
struct nlattr *nl_reg_rule;
- char *alpha2 = NULL;
- int rem_reg_rules = 0, r = 0;
+ char *alpha2;
+ int rem_reg_rules, r;
u32 num_rules = 0, rule_idx = 0, size_of_regd;
enum nl80211_dfs_regions dfs_region = NL80211_DFS_UNSET;
- struct ieee80211_regdomain *rd = NULL;
+ struct ieee80211_regdomain *rd;
if (!info->attrs[NL80211_ATTR_REG_ALPHA2])
return -EINVAL;
OpenPOWER on IntegriCloud