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 <[email protected]>
---
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..9ac9008 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -4205,11 +4205,14 @@ 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 Availibility 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,
MAX_NL80211_EXT_FEATURES = NUM_NL80211_EXT_FEATURES - 1
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
On Wed, 2014-12-24 at 04:47 -0800, Avinash Patil wrote:
> + * @NL80211_EXT_FEATURE_OFFCHAN_CAC: This device/driver supports
> + * offchannel Channel Availibility Check(CAC).
as Arend said, please indent (with a tab)
You're also mis-spelling "availability" :)
> * @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,
Better add it before rather than after the blank line.
johannes
________________________________________
From: Johannes Berg [[email protected]]
Sent: Monday, January 05, 2015 2:51 PM
To: Avinash Patil
Cc: [email protected]; Amitkumar Karwar; Cathy Luo; [email protected]
Subject: Re: [PATCH] cfg80211: check for carrier state only when offchanel CAC supported
On Wed, 2014-12-24 at 04:47 -0800, Avinash Patil wrote:
> + * @NL80211_EXT_FEATURE_OFFCHAN_CAC: This device/driver supports
> + * offchannel Channel Availibility Check(CAC).
>as Arend said, please indent (with a tab)
>You're also mis-spelling "availability" :)
> * @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,
>Better add it before rather than after the blank line.
>johannes
Thanks for review, Johannes.
Will send v3 with your comments addressed.
Thanks,
Avinash.