Return-path: Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:14731 "EHLO mx0a-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175AbbAELDl (ORCPT ); Mon, 5 Jan 2015 06:03:41 -0500 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.14.5/8.14.5) with SMTP id t05B3dn7005953 for ; Mon, 5 Jan 2015 03:03:40 -0800 Received: from sc-owa.marvell.com ([199.233.58.135]) by mx0a-0016f401.pphosted.com with ESMTP id 1rqhmq126c-2 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Mon, 05 Jan 2015 03:03:40 -0800 From: Avinash Patil To: CC: , , Avinash Patil Subject: [PATCH v3] cfg80211: check for carrier state only when offchanel CAC supported Date: Mon, 5 Jan 2015 22:03:04 +0530 Message-ID: <1420475584-5533-1-git-send-email-patila@marvell.com> (sfid-20150105_120344_381788_A7E15DA0) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: Checking for carrier state during start_radar_detection is needed only for devices which support offchannel CAC. This patch provides this additional check of extended feature offchannel CAC support while checking for carrier state. Signed-off-by: Avinash Patil --- include/uapi/linux/nl80211.h | 3 +++ net/wireless/nl80211.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 735ab43..c318802 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -4205,10 +4205,13 @@ enum nl80211_feature_flags { /** * enum nl80211_ext_feature_index - bit index of extended features. * + * @NL80211_EXT_FEATURE_OFFCHAN_CAC: This device/driver supports + * offchannel Channel Availability Check(CAC). * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index. */ enum nl80211_ext_feature_index { + NL80211_EXT_FEATURE_OFFCHAN_CAC, /* add new features before the definition below */ NUM_NL80211_EXT_FEATURES, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 39753de..b2abb37 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6138,7 +6138,9 @@ static int nl80211_start_radar_detection(struct sk_buff *skb, if (err) return err; - if (netif_carrier_ok(dev)) + if (wiphy_ext_feature_isset(&rdev->wiphy, + NL80211_EXT_FEATURE_OFFCHAN_CAC) && + netif_carrier_ok(dev)) return -EBUSY; if (wdev->cac_started) -- 1.8.1.4