aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-11-25 14:56:10 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-12-03 07:53:40 -0500
commit55f7435c189498ccbfe6a5fba606933587948d85 (patch)
treee45efd204e085d301484b454aa5ddd475edf4c18 /net/wireless
parent6c474799dccc91c9cf03cd18ec32f97929549e9f (diff)
cfg80211: DFS check dfs_region before usage
Check the DFS region before channel availability check. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 93e3356091ff..9cd8c6113e94 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5651,8 +5651,13 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,
5651 struct net_device *dev = info->user_ptr[1]; 5651 struct net_device *dev = info->user_ptr[1];
5652 struct wireless_dev *wdev = dev->ieee80211_ptr; 5652 struct wireless_dev *wdev = dev->ieee80211_ptr;
5653 struct cfg80211_chan_def chandef; 5653 struct cfg80211_chan_def chandef;
5654 enum nl80211_dfs_regions dfs_region;
5654 int err; 5655 int err;
5655 5656
5657 dfs_region = reg_get_dfs_region(wdev->wiphy);
5658 if (dfs_region == NL80211_DFS_UNSET)
5659 return -EINVAL;
5660
5656 err = nl80211_parse_chandef(rdev, info, &chandef); 5661 err = nl80211_parse_chandef(rdev, info, &chandef);
5657 if (err) 5662 if (err)
5658 return err; 5663 return err;