Return-path: Received: from mail-wg0-f52.google.com ([74.125.82.52]:47692 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933088AbaKMQNp (ORCPT ); Thu, 13 Nov 2014 11:13:45 -0500 Received: by mail-wg0-f52.google.com with SMTP id b13so17156185wgh.25 for ; Thu, 13 Nov 2014 08:13:43 -0800 (PST) From: Arik Nemtsov To: Cc: "Luis R. Rodriguez" , Jonathan Doron Subject: [PATCH v2 2/4] cfg80211: update missing fields in custom regulatory path Date: Thu, 13 Nov 2014 18:13:37 +0200 Message-Id: <1415895219-19848-2-git-send-email-arik@wizery.com> (sfid-20141113_171404_702797_E220AB6F) In-Reply-To: <1415895219-19848-1-git-send-email-arik@wizery.com> References: <1415895219-19848-1-git-send-email-arik@wizery.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Jonathan Doron 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 Signed-off-by: Arik Nemtsov --- net/wireless/reg.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 6459ddd..174d8f82 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1693,10 +1693,23 @@ 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 = NL80211_DFS_USABLE; + chan->dfs_state_entered = jiffies; + + 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 = (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, -- 1.9.1