From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless@vger.kernel.org
Subject: [RFC v2 09/12] nl80211: advertise socket TX status capability
Date: Fri, 21 Oct 2011 16:23:31 +0200 [thread overview]
Message-ID: <20111021142429.504139119@sipsolutions.net> (raw)
In-Reply-To: 20111021142322.229128720@sipsolutions.net
From: Johannes Berg <johannes.berg@intel.com>
The new wifi socket TX capability should be
supported by wifi drivers, let them advertise
whether they do or not.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
include/linux/nl80211.h | 15 +++++++++++++++
include/net/cfg80211.h | 3 ++-
net/wireless/nl80211.c | 2 ++
3 files changed, 19 insertions(+), 1 deletion(-)
--- a/include/linux/nl80211.h 2011-10-21 12:07:42.000000000 +0200
+++ b/include/linux/nl80211.h 2011-10-21 12:07:45.000000000 +0200
@@ -1137,6 +1137,9 @@ enum nl80211_commands {
* with support for the features listed in this attribute, see
* &enum nl80211_ap_sme_features.
*
+ * @NL80211_ATTR_FEATURE_FLAGS: This u32 attribute contains flags from
+ * &enum nl80211_feature_flags and is advertised in wiphy information.
+ *
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
*/
@@ -1367,6 +1370,8 @@ enum nl80211_attrs {
NL80211_ATTR_DEVICE_AP_MLME,
+ NL80211_ATTR_FEATURE_FLAGS,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
@@ -2693,4 +2698,14 @@ enum nl80211_ap_sme_features {
NL80211_AP_SME_WSC = 1 << 0,
};
+/**
+ * enum nl80211_feature_flags - device/driver features
+ * @NL80211_FEATURE_SK_TX_STATUS: This driver supports reflecting back
+ * TX status to the socket error queue when requested with the
+ * socket option.
+ */
+enum nl80211_feature_flags {
+ NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
+};
+
#endif /* __LINUX_NL80211_H */
--- a/include/net/cfg80211.h 2011-10-21 12:07:42.000000000 +0200
+++ b/include/net/cfg80211.h 2011-10-21 12:07:45.000000000 +0200
@@ -1873,6 +1873,7 @@ struct wiphy_wowlan_support {
* @software_iftypes: bitmask of software interface types, these are not
* subject to any restrictions since they are purely managed in SW.
* @flags: wiphy flags, see &enum wiphy_flags
+ * @features: features advertised to nl80211, see &enum nl80211_feature_flags.
* @bss_priv_size: each BSS struct has private data allocated with it,
* this variable determines its size
* @max_scan_ssids: maximum number of SSIDs the device can scan for in
@@ -1934,7 +1935,7 @@ struct wiphy {
/* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */
u16 interface_modes;
- u32 flags;
+ u32 flags, features;
u32 ap_sme_capa;
--- a/net/wireless/nl80211.c 2011-10-21 12:07:42.000000000 +0200
+++ b/net/wireless/nl80211.c 2011-10-21 12:07:45.000000000 +0200
@@ -1013,6 +1013,8 @@ static int nl80211_send_wiphy(struct sk_
NLA_PUT_U32(msg, NL80211_ATTR_DEVICE_AP_MLME,
dev->wiphy.ap_sme_capa);
+ NLA_PUT_U32(msg, NL80211_ATTR_FEATURE_FLAGS, dev->wiphy.features);
+
return genlmsg_end(msg, hdr);
nla_put_failure:
next prev parent reply other threads:[~2011-10-21 14:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-21 14:23 [RFC v2 00/12] get rid of AP mode monitor interfaces Johannes Berg
2011-10-21 14:23 ` [RFC v2 01/12] mac80211: add helper to free TX skb Johannes Berg
2011-10-21 14:23 ` [RFC v2 02/12] mac80211: add support for control port protocol in AP mode Johannes Berg
2011-10-21 14:23 ` [RFC v2 03/12] nl80211: allow subscribing to unexpected class3 frames Johannes Berg
2011-10-21 14:23 ` [RFC v2 04/12] mac80211: support spurious class3 event Johannes Berg
2011-10-21 14:23 ` [RFC v2 05/12] nl80211: advertise device AP SME Johannes Berg
2011-10-25 10:13 ` Eliad Peller
2011-10-21 14:23 ` [RFC v2 06/12] nl80211: add API to probe a client Johannes Berg
2011-10-21 14:23 ` [RFC v2 07/12] mac80211: support client probe Johannes Berg
2011-10-21 14:23 ` [RFC v2 08/12] net: add wireless TX status socket option Johannes Berg
2011-10-25 10:40 ` Eliad Peller
2011-10-21 14:23 ` Johannes Berg [this message]
2011-10-21 14:23 ` [RFC v2 10/12] mac80211: implement wifi TX status Johannes Berg
2011-10-21 14:23 ` [RFC v2 11/12] cfg80211: allow registering to beacons Johannes Berg
2011-10-21 14:23 ` [RFC v2 12/12] mac80211: report OBSS beacons Johannes Berg
2011-10-27 19:32 ` [RFC v2 13/12] cfg80211/mac80211: allow management TX to not wait for ACK Johannes Berg
2011-10-27 22:44 ` Eliad Peller
2011-10-28 8:02 ` Johannes Berg
2011-10-28 6:09 ` Helmut Schaa
2011-10-28 7:34 ` Johannes Berg
2011-10-28 7:48 ` Arend Van Spriel
2011-10-28 7:52 ` Helmut Schaa
2011-10-28 9:07 ` Arend Van Spriel
2011-10-28 9:15 ` Johannes Berg
2011-10-28 8:01 ` Johannes Berg
2011-10-28 9:10 ` Arend Van Spriel
2011-10-28 9:28 ` Helmut Schaa
2011-10-28 13:34 ` Kalle Valo
2011-10-29 12:01 ` Helmut Schaa
2011-10-28 17:22 ` Arend van Spriel
2011-10-28 9:18 ` [RFC v3 " 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=20111021142429.504139119@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/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).