diff options
author | Janusz Dziedzic <janusz.dziedzic@tieto.com> | 2014-02-21 19:46:13 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-25 17:32:54 +0100 |
commit | 31559f35c5724976fd975e5d7e90cdb693b8dd27 (patch) | |
tree | 92f0a7e9a2474e730a2461c1e284cb16f77d1b4b /net/mac80211/cfg.c | |
parent | 089027e57cfa79337feffdd7252c8ba0be352afa (diff) | |
download | op-kernel-dev-31559f35c5724976fd975e5d7e90cdb693b8dd27.zip op-kernel-dev-31559f35c5724976fd975e5d7e90cdb693b8dd27.tar.gz |
cfg80211: DFS get CAC time from regulatory database
Send Channel Availability Check time as a parameter
of start_radar_detection() callback.
Get CAC time from regulatory database.
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 1acb291..80534f5 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2914,11 +2914,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); @@ -2937,9 +2937,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); |