2011-10-08 14:48:29 +00:00
|
|
|
--- a/nl80211.h
|
|
|
|
+++ b/nl80211.h
|
2012-09-28 18:29:16 +00:00
|
|
|
@@ -565,6 +565,14 @@
|
|
|
|
* %NL80211_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ with
|
|
|
|
* %NL80211_ATTR_WIPHY_CHANNEL_TYPE.
|
2012-04-16 21:13:18 +00:00
|
|
|
*
|
2012-09-28 18:29:16 +00:00
|
|
|
+ * @NL80211_CMD_START_P2P_DEVICE: Start the given P2P Device, identified by
|
|
|
|
+ * its %NL80211_ATTR_WDEV identifier. It must have been created with
|
|
|
|
+ * %NL80211_CMD_NEW_INTERFACE previously. After it has been started, the
|
|
|
|
+ * P2P Device can be used for P2P operations, e.g. remain-on-channel and
|
|
|
|
+ * public action frame TX.
|
|
|
|
+ * @NL80211_CMD_STOP_P2P_DEVICE: Stop the given P2P Device, identified by
|
|
|
|
+ * its %NL80211_ATTR_WDEV identifier.
|
2012-04-16 21:13:18 +00:00
|
|
|
+ *
|
|
|
|
* @NL80211_CMD_MAX: highest used command number
|
|
|
|
* @__NL80211_CMD_AFTER_LAST: internal use
|
|
|
|
*/
|
2012-09-28 18:29:16 +00:00
|
|
|
@@ -708,6 +716,9 @@ enum nl80211_commands {
|
2012-04-16 21:13:18 +00:00
|
|
|
|
2012-09-28 18:29:16 +00:00
|
|
|
NL80211_CMD_CH_SWITCH_NOTIFY,
|
2012-04-16 21:13:18 +00:00
|
|
|
|
2012-09-28 18:29:16 +00:00
|
|
|
+ NL80211_CMD_START_P2P_DEVICE,
|
|
|
|
+ NL80211_CMD_STOP_P2P_DEVICE,
|
2012-04-16 21:13:18 +00:00
|
|
|
+
|
|
|
|
/* add new commands above here */
|
|
|
|
|
|
|
|
/* used to define NL80211_CMD_MAX below */
|
2012-09-28 18:29:16 +00:00
|
|
|
@@ -1506,6 +1517,8 @@ enum nl80211_attrs {
|
2012-04-16 21:13:18 +00:00
|
|
|
|
2012-09-28 18:29:16 +00:00
|
|
|
NL80211_ATTR_USER_REG_HINT_TYPE,
|
2012-04-16 21:13:18 +00:00
|
|
|
|
2012-09-28 18:29:16 +00:00
|
|
|
+ NL80211_ATTR_WIPHY_ANTENNA_GAIN,
|
2012-04-16 21:13:18 +00:00
|
|
|
+
|
|
|
|
/* add attributes here, update the policy in nl80211.c */
|
|
|
|
|
|
|
|
__NL80211_ATTR_AFTER_LAST,
|
2012-09-28 18:29:16 +00:00
|
|
|
@@ -1575,6 +1588,10 @@ enum nl80211_attrs {
|
|
|
|
* @NL80211_IFTYPE_MESH_POINT: mesh point
|
|
|
|
* @NL80211_IFTYPE_P2P_CLIENT: P2P client
|
|
|
|
* @NL80211_IFTYPE_P2P_GO: P2P group owner
|
|
|
|
+ * @NL80211_IFTYPE_P2P_DEVICE: P2P device interface type, this is not a netdev
|
|
|
|
+ * and therefore can't be created in the normal ways, use the
|
|
|
|
+ * %NL80211_CMD_START_P2P_DEVICE and %NL80211_CMD_STOP_P2P_DEVICE
|
|
|
|
+ * commands to create and destroy one
|
|
|
|
* @NL80211_IFTYPE_MAX: highest interface type number currently defined
|
|
|
|
* @NUM_NL80211_IFTYPES: number of defined interface types
|
|
|
|
*
|
|
|
|
@@ -1593,6 +1610,7 @@ enum nl80211_iftype {
|
|
|
|
NL80211_IFTYPE_MESH_POINT,
|
|
|
|
NL80211_IFTYPE_P2P_CLIENT,
|
|
|
|
NL80211_IFTYPE_P2P_GO,
|
|
|
|
+ NL80211_IFTYPE_P2P_DEVICE,
|
2011-10-08 14:48:29 +00:00
|
|
|
|
2012-09-28 18:29:16 +00:00
|
|
|
/* keep last */
|
|
|
|
NUM_NL80211_IFTYPES,
|
|
|
|
@@ -1744,6 +1762,8 @@ enum nl80211_sta_bss_param {
|
2012-02-07 11:28:21 +00:00
|
|
|
* @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
|
2012-09-28 18:29:16 +00:00
|
|
|
* @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
|
|
|
|
* @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
|
2011-10-08 14:48:29 +00:00
|
|
|
+ * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU
|
|
|
|
+ * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
|
|
|
|
* @__NL80211_STA_INFO_AFTER_LAST: internal
|
|
|
|
* @NL80211_STA_INFO_MAX: highest possible station info attribute
|
|
|
|
*/
|
2012-09-28 18:29:16 +00:00
|
|
|
@@ -1768,6 +1788,8 @@ enum nl80211_sta_info {
|
2012-02-07 11:28:21 +00:00
|
|
|
NL80211_STA_INFO_STA_FLAGS,
|
2012-09-28 18:29:16 +00:00
|
|
|
NL80211_STA_INFO_BEACON_LOSS,
|
|
|
|
NL80211_STA_INFO_T_OFFSET,
|
2011-10-08 14:48:29 +00:00
|
|
|
+ NL80211_STA_INFO_CHAIN_SIGNAL,
|
|
|
|
+ NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
|
|
|
|
|
|
|
|
/* keep last */
|
|
|
|
__NL80211_STA_INFO_AFTER_LAST,
|
2012-09-28 18:29:16 +00:00
|
|
|
@@ -2994,12 +3016,18 @@ enum nl80211_ap_sme_features {
|
|
|
|
* @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested
|
|
|
|
* to work properly to suppport receiving regulatory hints from
|
|
|
|
* cellular base stations.
|
|
|
|
+ * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: If this is set, an active
|
|
|
|
+ * P2P Device (%NL80211_IFTYPE_P2P_DEVICE) requires its own channel
|
|
|
|
+ * in the interface combinations, even when it's only used for scan
|
|
|
|
+ * and remain-on-channel. This could be due to, for example, the
|
|
|
|
+ * remain-on-channel implementation requiring a channel context.
|
2012-04-16 21:13:18 +00:00
|
|
|
*/
|
|
|
|
enum nl80211_feature_flags {
|
2012-09-28 18:29:16 +00:00
|
|
|
- NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
|
|
|
|
- NL80211_FEATURE_HT_IBSS = 1 << 1,
|
|
|
|
- NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2,
|
|
|
|
- NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3,
|
|
|
|
+ NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
|
|
|
|
+ NL80211_FEATURE_HT_IBSS = 1 << 1,
|
|
|
|
+ NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2,
|
|
|
|
+ NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3,
|
|
|
|
+ NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 1 << 4,
|
2012-04-16 21:13:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|