From: Arik Nemtsov <arik@wizery.com>
Date: Sun, 16 Nov 2014 14:37:47 +0000 (+0200)
Subject: cfg80211: explicitly initialize some fields in custom reg path
X-Git-Tag: v3.19-rc1~118^2~134^2~2^2~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c7ab508190aee6b4a62cfab7ee08457602468672;p=~emulex%2Finfiniband.git

cfg80211: explicitly initialize some fields in custom reg path

Explicitly initialize the DFS state and beacon found state when handling
channels in the custom regulatory path.

Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Acked-by: Luis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index a60f391b30a..32d8310b0f8 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1598,6 +1598,9 @@ static void handle_channel_custom(struct wiphy *wiphy,
 		bw_flags |= IEEE80211_CHAN_NO_160MHZ;
 
 	chan->dfs_state_entered = jiffies;
+	chan->dfs_state = NL80211_DFS_USABLE;
+
+	chan->beacon_found = false;
 	chan->flags |= map_regdom_flags(reg_rule->flags) | bw_flags;
 	chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain);
 	chan->max_reg_power = chan->max_power =