Return-path: Received: from mail-ea0-f177.google.com ([209.85.215.177]:61995 "EHLO mail-ea0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751896AbaAOMRF (ORCPT ); Wed, 15 Jan 2014 07:17:05 -0500 Received: by mail-ea0-f177.google.com with SMTP id n15so417369ead.36 for ; Wed, 15 Jan 2014 04:17:01 -0800 (PST) From: Janusz Dziedzic To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, mcgrof@do-not-panic.com, Janusz Dziedzic Subject: [RFC 1/2] cfg80211/mac80211: DFS pass CAC time as a parameter Date: Wed, 15 Jan 2014 13:16:49 +0100 Message-Id: <1389788210-7246-1-git-send-email-janusz.dziedzic@tieto.com> (sfid-20140115_131708_578330_9FF1A7A5) Sender: linux-wireless-owner@vger.kernel.org List-ID: Send Channel Availability Check time as a parameter of start_radar_detection() callback. We could have different CAC time configuration for Off-channel CAC and for weather channels. Signed-off-by: Janusz Dziedzic --- Based on patches: Implement DFS CAC time as regulatory param include/net/cfg80211.h | 3 ++- net/mac80211/cfg.c | 8 ++++---- net/wireless/nl80211.c | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index f756b94..71ca782 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -2487,7 +2487,8 @@ struct cfg80211_ops { int (*start_radar_detection)(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_chan_def *chandef); + struct cfg80211_chan_def *chandef, + u32 cac_time_ms); int (*update_ft_ies)(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_update_ft_ies_params *ftie); int (*crit_proto_start)(struct wiphy *wiphy, diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 09d2e58..5c2b69c 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2899,11 +2899,11 @@ static int ieee80211_cancel_remain_on_channel(struct wiphy *wiphy, static int ieee80211_start_radar_detection(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_chan_def *chandef) + struct cfg80211_chan_def *chandef, + u32 cac_time_ms) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_local *local = sdata->local; - unsigned long timeout; int err; mutex_lock(&local->mtx); @@ -2922,9 +2922,9 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy, if (err) goto out_unlock; - timeout = msecs_to_jiffies(IEEE80211_DFS_MIN_CAC_TIME_MS); ieee80211_queue_delayed_work(&sdata->local->hw, - &sdata->dfs_cac_timer_work, timeout); + &sdata->dfs_cac_timer_work, + msecs_to_jiffies(cac_time_ms)); out_unlock: mutex_unlock(&local->mtx); diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 53b31f2..8bb2064 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5764,7 +5764,8 @@ static int nl80211_start_radar_detection(struct sk_buff *skb, if (err) return err; - err = rdev->ops->start_radar_detection(&rdev->wiphy, dev, &chandef); + err = rdev->ops->start_radar_detection(&rdev->wiphy, dev, &chandef, + IEEE80211_DFS_MIN_CAC_TIME_MS); if (!err) { wdev->channel = chandef.chan; wdev->cac_started = true; -- 1.7.9.5