Commit 1f074bd8 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

nl80211: advertise socket TX status capability 



The new wifi socket TX capability should be
supported by wifi drivers, let them advertise
whether they do or not.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e4121562

include/linux/nl80211.h

+18 −0
Original line number Diff line number Diff line
@@ -695,6 +695,8 @@ enum nl80211_commands { 
#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE

#define NL80211_CMD_REG_BEACON_HINT NL80211_CMD_REG_BEACON_HINT



#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS



/* source-level API compatibility */

#define NL80211_CMD_GET_MESH_PARAMS NL80211_CMD_GET_MESH_CONFIG

#define NL80211_CMD_SET_MESH_PARAMS NL80211_CMD_SET_MESH_CONFIG
@@ -1156,6 +1158,9 @@ enum nl80211_commands { 
 *	it will also not give a status callback nor return a cookie. This is

 *	mostly useful for probe responses to save airtime.

 *

 * @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

 */
@@ -1388,6 +1393,8 @@ enum nl80211_attrs { 


	NL80211_ATTR_DONT_WAIT_FOR_ACK,



	NL80211_ATTR_FEATURE_FLAGS,



	/* add attributes here, update the policy in nl80211.c */



	__NL80211_ATTR_AFTER_LAST,
@@ -1422,6 +1429,7 @@ enum nl80211_attrs { 
#define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES

#define NL80211_ATTR_KEY NL80211_ATTR_KEY

#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS

#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS



#define NL80211_MAX_SUPP_RATES			32

#define NL80211_MAX_SUPP_REG_RULES		32
@@ -2709,4 +2717,14 @@ enum nl80211_ap_sme_features { 
};

 */



/**

 * 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 */

include/net/cfg80211.h

+2 −1
Original line number Diff line number Diff line
@@ -1881,6 +1881,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
@@ -1942,7 +1943,7 @@ struct wiphy { 
	/* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */

	u16 interface_modes;



	u32 flags;

	u32 flags, features;



	u32 ap_sme_capa;

net/wireless/nl80211.c

+2 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags, 
		NLA_PUT_U32(msg, NL80211_ATTR_DEVICE_AP_SME,

			    dev->wiphy.ap_sme_capa);



	NLA_PUT_U32(msg, NL80211_ATTR_FEATURE_FLAGS, dev->wiphy.features);



	return genlmsg_end(msg, hdr);



 nla_put_failure: