diff options
| author | Arik Nemtsov <arik@wizery.com> | 2014-11-16 14:37:47 (GMT) |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-19 17:49:33 (GMT) |
| commit | c7ab508190aee6b4a62cfab7ee08457602468672 (patch) | |
| tree | 538d6dd6b882d91bb8c3523d49a3bfdd3bb1c5ff | |
| parent | 2e18b38fc8fb0323804e4a7812cb1a8ea78b9dd7 (diff) | |
| download | linux-c7ab508190aee6b4a62cfab7ee08457602468672.tar.xz | |
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>
| -rw-r--r-- | net/wireless/reg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index a60f391..32d8310 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 = |