From: Victor Goldenshtein <victorg@ti.com>
To: <linux-wireless@vger.kernel.org>
Cc: <kgiori@qca.qualcomm.com>, <mcgrof@frijolero.org>,
<zefir.kurtisi@neratec.com>, <adrian.chadd@gmail.com>, <j@w1.fi>,
<johannes@sipsolutions.net>, <coelho@ti.com>, <assaf@ti.com>,
<yoni.divinsky@ti.com>, <igalc@ti.com>, <adrian@freebsd.org>,
<nbd@nbd.name>, <simon.wunderlich@s2003.tu-chemnitz.de>
Subject: [PATCH v2 3/7] nl80211/cfg80211: add ability to enable TX on op-channel
Date: Tue, 19 Jun 2012 16:10:59 +0300 [thread overview]
Message-ID: <1340111463-4554-3-git-send-email-victorg@ti.com> (raw)
In-Reply-To: <1340111463-4554-1-git-send-email-victorg@ti.com>
The dfs master device should monitor radar channels
for potential radar interference for a minimum of
CAC (channel availability check) time, during this
period no tx can occur. If no radar interference
is detected the dfs master may initiate the tx with
new NL80211_CMD_DFS_ENABLE_TX command.
If this command is invoked prior performing a CAC or
the time passed sines the beginning of the CAC is
less than min CAC time (60 sec), -EPERM is returned.
Signed-off-by: Victor Goldenshtein <victorg@ti.com>
---
include/linux/nl80211.h | 11 +++++++++++
include/net/cfg80211.h | 5 +++++
net/wireless/nl80211.c | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index ea6ce93..2f869a4 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -556,6 +556,15 @@
* @NL80211_CMD_RADAR_DETECT: Start radar detection in the driver/HW. Once
* radar detected usermode notified with this event.
*
+ * @NL80211_CMD_DFS_ENABLE_TX: Initiate tx after verifying radar clearness on
+ * dfs channel. The dfs master device should monitor radar channels
+ * for potential radar interference for a minimum of CAC (channel
+ * availability check) time, during this period no tx can occur. If no
+ * radar interference is detected during this period the dfs master may
+ * initiate the tx. If this command is invoked prior performing a CAC or
+ * the time passed sines the beginning of the CAC is less than
+ * NL80211_DFS_MIN_CAC_TIME_MS, -EPERM is returned.
+ *
* @NL80211_CMD_MAX: highest used command number
* @__NL80211_CMD_AFTER_LAST: internal use
*/
@@ -701,6 +710,8 @@ enum nl80211_commands {
NL80211_CMD_RADAR_DETECT,
+ NL80211_CMD_DFS_ENABLE_TX,
+
/* add new commands above here */
/* used to define NL80211_CMD_MAX below */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 523d953..f7fe44e 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1531,6 +1531,8 @@ struct cfg80211_gtk_rekey_data {
* See @ethtool_ops.get_strings
*
* @start_radar_detection: Start radar detection in the driver.
+ *
+ * @dfs_en_tx: Enable tx after radar interference check.
*/
struct cfg80211_ops {
int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -1740,6 +1742,9 @@ struct cfg80211_ops {
int (*start_radar_detection)(struct wiphy *wiphy,
struct net_device *dev,
struct ieee80211_channel *chan);
+
+ int (*dfs_en_tx)(struct wiphy *wiphy, struct net_device *dev,
+ struct ieee80211_channel *chan);
};
/*
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 573c966..966f7cc 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4273,6 +4273,34 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,
return cfg80211_start_radar_detection(rdev, dev, chan);
}
+static int nl80211_dfs_en_tx(struct sk_buff *skb, struct genl_info *info)
+{
+ struct cfg80211_registered_device *rdev = info->user_ptr[0];
+ struct net_device *dev = info->user_ptr[1];
+ bool dfs_supported = !!(rdev->wiphy.features & NL80211_FEATURE_DFS);
+ struct ieee80211_channel *chan;
+ int freq;
+
+ if (!rdev->ops->dfs_en_tx || !dfs_supported)
+ return -EOPNOTSUPP;
+
+ if (info->attrs[NL80211_ATTR_WIPHY_FREQ])
+ freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);
+ else
+ return -EINVAL;
+
+ chan = ieee80211_get_channel(&rdev->wiphy, freq);
+ if (!chan)
+ return -EINVAL;
+
+ if ((!chan->radar_detect_timeout ||
+ time_is_after_jiffies(chan->radar_detect_timeout)) &&
+ (chan->flags & IEEE80211_CHAN_RADAR))
+ return -EPERM;
+
+ return rdev->ops->dfs_en_tx(&rdev->wiphy, dev, chan);
+}
+
static int nl80211_send_bss(struct sk_buff *msg, struct netlink_callback *cb,
u32 seq, int flags,
struct cfg80211_registered_device *rdev,
@@ -7030,6 +7058,14 @@ static struct genl_ops nl80211_ops[] = {
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
NL80211_FLAG_NEED_RTNL,
},
+ {
+ .cmd = NL80211_CMD_DFS_ENABLE_TX,
+ .doit = nl80211_dfs_en_tx,
+ .policy = nl80211_policy,
+ .flags = GENL_ADMIN_PERM,
+ .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_NEED_RTNL,
+ },
};
--
1.7.5.4
next prev parent reply other threads:[~2012-06-19 13:14 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-19 13:10 [PATCH v2 1/7] nl80211/cfg80211: add radar detection command/event Victor Goldenshtein
2012-06-19 13:10 ` [PATCH v2 2/7] mac80211: " Victor Goldenshtein
2012-06-20 8:40 ` Johannes Berg
2012-06-19 13:10 ` Victor Goldenshtein [this message]
2012-06-20 8:44 ` [PATCH v2 3/7] nl80211/cfg80211: add ability to enable TX on op-channel Johannes Berg
2012-06-20 8:46 ` Johannes Berg
2012-06-20 11:53 ` Zefir Kurtisi
2012-06-20 11:57 ` Johannes Berg
2012-06-20 12:58 ` Zefir Kurtisi
2012-06-20 13:12 ` Johannes Berg
2012-06-20 13:32 ` Goldenshtein, Victor
2012-06-20 14:18 ` Johannes Berg
2012-06-20 13:38 ` Zefir Kurtisi
2012-06-20 14:19 ` Johannes Berg
2012-06-20 15:06 ` Goldenshtein, Victor
2012-06-20 14:34 ` Goldenshtein, Victor
2012-06-19 13:11 ` [PATCH v2 4/7] mac80211: " Victor Goldenshtein
2012-06-19 13:11 ` [PATCH v2 5/7] nl80211/cfg80211: add ap channel switch command/event Victor Goldenshtein
2012-06-20 8:47 ` Johannes Berg
2012-06-20 17:17 ` Goldenshtein, Victor
2012-06-20 17:39 ` Johannes Berg
2012-06-21 5:35 ` Goldenshtein, Victor
2012-06-21 7:06 ` Johannes Berg
2012-06-19 13:11 ` [PATCH v2 6/7] mac80211: " Victor Goldenshtein
2012-06-20 8:48 ` Johannes Berg
2012-06-19 13:11 ` [PATCH v2 7/7] mac80211: add DFS support to monitor interface Victor Goldenshtein
2012-06-20 8:49 ` Johannes Berg
2012-06-20 16:50 ` Goldenshtein, Victor
2012-06-20 8:40 ` [PATCH v2 1/7] nl80211/cfg80211: add radar detection command/event Johannes Berg
2012-06-20 12:22 ` Zefir Kurtisi
2012-06-20 12:29 ` Johannes Berg
2012-06-20 16:42 ` Goldenshtein, Victor
2012-06-20 17:40 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340111463-4554-3-git-send-email-victorg@ti.com \
--to=victorg@ti.com \
--cc=adrian.chadd@gmail.com \
--cc=adrian@freebsd.org \
--cc=assaf@ti.com \
--cc=coelho@ti.com \
--cc=igalc@ti.com \
--cc=j@w1.fi \
--cc=johannes@sipsolutions.net \
--cc=kgiori@qca.qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
--cc=mcgrof@frijolero.org \
--cc=nbd@nbd.name \
--cc=simon.wunderlich@s2003.tu-chemnitz.de \
--cc=yoni.divinsky@ti.com \
--cc=zefir.kurtisi@neratec.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).