diff options
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 1acb29109b45..80534f524fd6 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, | |||
2914 | 2914 | ||
2915 | static int ieee80211_start_radar_detection(struct wiphy *wiphy, | 2915 | static int ieee80211_start_radar_detection(struct wiphy *wiphy, |
2916 | struct net_device *dev, | 2916 | struct net_device *dev, |
2917 | struct cfg80211_chan_def *chandef) | 2917 | struct cfg80211_chan_def *chandef, |
2918 | u32 cac_time_ms) | ||
2918 | { | 2919 | { |
2919 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 2920 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
2920 | struct ieee80211_local *local = sdata->local; | 2921 | struct ieee80211_local *local = sdata->local; |
2921 | unsigned long timeout; | ||
2922 | int err; | 2922 | int err; |
2923 | 2923 | ||
2924 | mutex_lock(&local->mtx); | 2924 | mutex_lock(&local->mtx); |
@@ -2937,9 +2937,9 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy, | |||
2937 | if (err) | 2937 | if (err) |
2938 | goto out_unlock; | 2938 | goto out_unlock; |
2939 | 2939 | ||
2940 | timeout = msecs_to_jiffies(IEEE80211_DFS_MIN_CAC_TIME_MS); | ||
2941 | ieee80211_queue_delayed_work(&sdata->local->hw, | 2940 | ieee80211_queue_delayed_work(&sdata->local->hw, |
2942 | &sdata->dfs_cac_timer_work, timeout); | 2941 | &sdata->dfs_cac_timer_work, |
2942 | msecs_to_jiffies(cac_time_ms)); | ||
2943 | 2943 | ||
2944 | out_unlock: | 2944 | out_unlock: |
2945 | mutex_unlock(&local->mtx); | 2945 | mutex_unlock(&local->mtx); |