diff options
| author | Arik Nemtsov <arik@wizery.com> | 2014-11-16 16:37:46 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-19 18:49:33 +0100 |
| commit | 2e18b38fc8fb0323804e4a7812cb1a8ea78b9dd7 (patch) | |
| tree | c266dd00141b933ca4ef118a06cc9a3b43d68ad3 /net/wireless/reg.c | |
| parent | 628c010f1f395459e6871e15b8dbd6f8c8045285 (diff) | |
| download | linux-2e18b38fc8fb0323804e4a7812cb1a8ea78b9dd7.tar.gz linux-2e18b38fc8fb0323804e4a7812cb1a8ea78b9dd7.tar.bz2 linux-2e18b38fc8fb0323804e4a7812cb1a8ea78b9dd7.zip | |
cfg80211: update missing fields in custom regulatory path
Some channels fields were not being updated in the custom regulatory
path. Update them according to the code in handle_channel().
Signed-off-by: Jonathan Doron <jonathanx.doron@intel.com>
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>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 7449a8c0f9fd..a60f391b30a6 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1597,10 +1597,20 @@ static void handle_channel_custom(struct wiphy *wiphy, if (max_bandwidth_khz < MHZ_TO_KHZ(160)) bw_flags |= IEEE80211_CHAN_NO_160MHZ; + chan->dfs_state_entered = jiffies; 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 = (int) MBM_TO_DBM(power_rule->max_eirp); + + if (chan->flags & IEEE80211_CHAN_RADAR) { + if (reg_rule->dfs_cac_ms) + chan->dfs_cac_ms = reg_rule->dfs_cac_ms; + else + chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS; + } + + chan->max_power = chan->max_reg_power; } static void handle_band_custom(struct wiphy *wiphy, |