From patchwork Mon Dec 16 10:55:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Puzyniak X-Patchwork-Id: 3353211 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 58194C0D4A for ; Mon, 16 Dec 2013 10:56:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 141072013D for ; Mon, 16 Dec 2013 10:56:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 983252010E for ; Mon, 16 Dec 2013 10:56:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752768Ab3LPK4J (ORCPT ); Mon, 16 Dec 2013 05:56:09 -0500 Received: from mail-ee0-f54.google.com ([74.125.83.54]:47922 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006Ab3LPK4I (ORCPT ); Mon, 16 Dec 2013 05:56:08 -0500 Received: by mail-ee0-f54.google.com with SMTP id e51so1824687eek.27 for ; Mon, 16 Dec 2013 02:56:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=Q3hnhWDaluHUfn3+eTMhtyfgNLZnJcDU3gDWDiaUdbc=; b=qwFU/yyzQUBWwzdlfdPb+srkCV4qSEywkzB+n7aVuHVoEGR6arSmP2euecOh+opupl O08xU+eC4f4UWBDumSWdWveE3VzbPLN+SAXgfGlIlV3oI9JJ7j8U7PwlRrxpItP4aI2b wJxoTKaS8U/bdFGO6qq2EK3PYvKjzeB5vfsX4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Q3hnhWDaluHUfn3+eTMhtyfgNLZnJcDU3gDWDiaUdbc=; b=QmeamyZsY50g0wcAylA7JxkR13UH1eFPqA4ctRPElHvkKIPRJhsyXX06p2ZyEPi1a4 awIQlg9zU1AJ8vBSrwtGV+9DXWVU4jJplsBat5wjWdf6P3Jrj2oQpj/HtZ8e8Eh+YyUe 4UKNyr37tau9qxxpL0yM0JMBuiXmYyOcVOk5I8JZXCGRxe7rpcN0aQ+U9NgNiJ+A1WHk Ns+0r5n2Sl9IUqJ6GE60kIrEUyRWLLCwpvxQTTOc+QjyFxFupDVkcXEd3XqeNX9VkAwR 6HBHkKYQn0tgi7oZ9/8mgJOD3M4XOazQyFI7SReqWvS1zvQvnciOh7ljijMal+mrgT63 EjBw== X-Gm-Message-State: ALoCoQkwiCIKorCgRrWhIHhivZFlprNWwlmE2DJIWPse0ENXkEgRuELMyzglOh5sBaOF35rrOcDtf5Rip2S/hUvRTxWusaqiDce+50Awg7+QDbDQbG+KhjQ= X-Received: by 10.14.88.134 with SMTP id a6mr15976070eef.5.1387191366810; Mon, 16 Dec 2013 02:56:06 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id o1sm40830774eea.10.2013.12.16.02.56.05 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Dec 2013 02:56:06 -0800 (PST) From: Marek Puzyniak To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Marek Puzyniak Subject: [PATCH v4] cfg80211: fix dfs channel state after stopping AP Date: Mon, 16 Dec 2013 11:55:46 +0100 Message-Id: <1387191346-23830-1-git-send-email-marek.puzyniak@tieto.com> X-Mailer: git-send-email 1.8.1.2 X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In AP mode DFS channel state is changed to DFS_AVAILABLE after successful CAC and remains as such until a radar signal is detected during the In-Service Monitoring. When AP is stopped it is no longer monitoring current channel for radar signals. DFS channel state should be changed to DFS_USABLE when last AP interface is stopped. Starting AP again on that channel will start CAC instead of starting radiation. Signed-off-by: Marek Puzyniak --- net/wireless/ap.c | 40 ++++++++++++++++++++++++++++++++++++++++ net/wireless/chan.c | 38 ++++++++++++++++++++++++++++++++++++++ net/wireless/core.h | 11 +++++++++++ 3 files changed, 89 insertions(+) diff --git a/net/wireless/ap.c b/net/wireless/ap.c index 324e8d8..bb7b206 100644 --- a/net/wireless/ap.c +++ b/net/wireless/ap.c @@ -6,6 +6,43 @@ #include "rdev-ops.h" +static bool cfg80211_is_last_ap_running(struct cfg80211_registered_device *rdev, + struct net_device *dev) +{ + struct wireless_dev *wdev = dev->ieee80211_ptr; + struct wireless_dev *wdev_iter; + + ASSERT_WDEV_LOCK(wdev); + + if (rdev->num_running_ifaces == 1) { + /* Last running AP iface*/ + return true; + } + + /* More running interfaces */ + list_for_each_entry(wdev_iter, &rdev->wdev_list, list) { + if (wdev_iter == wdev) + continue; + + if (!wdev_iter->netdev) + continue; + + wdev_lock(wdev_iter); + if (!netif_running(wdev_iter->netdev)) { + wdev_unlock(wdev_iter); + continue; + } + + if (wdev_iter->iftype == NL80211_IFTYPE_AP) { + wdev_unlock(wdev_iter); + return false; + } + wdev_unlock(wdev_iter); + } + + return true; +} + static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev, struct net_device *dev) { @@ -31,6 +68,9 @@ static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev, wdev->ssid_len = 0; } + if (cfg80211_is_last_ap_running(rdev, dev)) + cfg80211_leave_dfs_chandef(wdev->wiphy, &wdev->preset_chandef); + return err; } diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 78559b5..54c217a 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -490,6 +490,44 @@ static bool cfg80211_chandef_dfs_available(struct wiphy *wiphy, return r; } +static void cfg80211_leave_dfs_chans(struct wiphy *wiphy, + u32 center_freq, + u32 bandwidth) +{ + struct ieee80211_channel *c; + u32 freq, start_freq, end_freq; + + start_freq = cfg80211_get_start_freq(center_freq, bandwidth); + end_freq = cfg80211_get_end_freq(center_freq, bandwidth); + + for (freq = start_freq; freq <= end_freq; freq += 20) { + c = ieee80211_get_channel(wiphy, freq); + if (!c) + continue; + if (c->dfs_state != NL80211_DFS_AVAILABLE) + continue; + + c->dfs_state = NL80211_DFS_USABLE; + c->dfs_state_entered = jiffies; + } +} + +void cfg80211_leave_dfs_chandef(struct wiphy *wiphy, + struct cfg80211_chan_def *chandef) +{ + int width; + + if (WARN_ON(!cfg80211_chandef_valid(chandef))) + return; + + width = cfg80211_chandef_get_width(chandef); + cfg80211_leave_dfs_chans(wiphy, chandef->center_freq1, width); + + if (!chandef->center_freq2) + return; + + cfg80211_leave_dfs_chans(wiphy, chandef->center_freq2, width); +} static bool cfg80211_secondary_chans_ok(struct wiphy *wiphy, u32 center_freq, u32 bandwidth, diff --git a/net/wireless/core.h b/net/wireless/core.h index 37ec16d..4ed2c81 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -398,6 +398,17 @@ void cfg80211_set_dfs_state(struct wiphy *wiphy, void cfg80211_dfs_channels_update_work(struct work_struct *work); +/** + * cfg80211_leave_dfs_chandef - Leaving dfs chandef + * @wiphy: the wiphy + * @chandef: chandef for the current channel + * + * This function is called when dfs chandef is being not used for different + * reasons. Change channels DFS_AVAILABLE to DFS_USABLE again. Leave channels + * DFS_UNAVAILABLE untouched. + */ +void cfg80211_leave_dfs_chandef(struct wiphy *wiphy, + struct cfg80211_chan_def *chandef); static inline int cfg80211_can_change_interface(struct cfg80211_registered_device *rdev,