Return-path: Received: from cora.hrz.tu-chemnitz.de ([134.109.228.40]:58613 "EHLO cora.hrz.tu-chemnitz.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752165Ab3A2MYO (ORCPT ); Tue, 29 Jan 2013 07:24:14 -0500 From: Simon Wunderlich To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, victorg@ti.com, linville@tuxdriver.com, kgiori@qca.qualcomm.com, zefir.kurtisi@neratec.com, adrian@freebsd.org, j@w1.fi, coelho@ti.com, igalc@ti.com, nbd@nbd.name, mathias.kretschmer@fokus.fraunhofer.de, Simon Wunderlich Subject: [PATCHv7 3/3] nl80211: allow DFS in start_ap Date: Tue, 29 Jan 2013 13:22:00 +0100 Message-Id: <1359462120-22898-4-git-send-email-siwu@hrz.tu-chemnitz.de> (sfid-20130129_132418_365952_B9848F37) In-Reply-To: <1359462120-22898-1-git-send-email-siwu@hrz.tu-chemnitz.de> References: <1359462120-22898-1-git-send-email-siwu@hrz.tu-chemnitz.de> Sender: linux-wireless-owner@vger.kernel.org List-ID: This patch enables DFS within nl80211/cfg80211. start_ap now checks if DFS is allowed on the channel with the selected channel width. Signed-off-by: Simon Wunderlich --- Changes to PATCHv6: * let reg_can_beacon() and others check for channel states, simplify start_ap * check using cfg80211_chandef_dfs_required Changes to PATCHv5: * check radar detection width --- net/wireless/nl80211.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 2e0216a..fd7b654 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2608,6 +2608,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) struct wireless_dev *wdev = dev->ieee80211_ptr; struct cfg80211_ap_settings params; int err; + u8 radar_detect_width = 0; if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP && dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) @@ -2726,9 +2727,17 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) if (!cfg80211_reg_can_beacon(&rdev->wiphy, ¶ms.chandef)) return -EINVAL; + err = cfg80211_chandef_dfs_required(wdev->wiphy, ¶ms.chandef); + if (err < 0) + return -EINVAL; + if (err) + radar_detect_width = BIT(params.chandef.width); + mutex_lock(&rdev->devlist_mtx); - err = cfg80211_can_use_chan(rdev, wdev, params.chandef.chan, - CHAN_MODE_SHARED); + err = cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype, + params.chandef.chan, + CHAN_MODE_SHARED, + radar_detect_width); mutex_unlock(&rdev->devlist_mtx); if (err) -- 1.7.10.4