iw: sync nl80211.h (fixes settting antenna_gain)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 40503
This commit is contained in:
Felix Fietkau
parent
0d7197116e
commit
4d0f5b36c4
1 changed files with 186 additions and 3 deletions
|
|
@ -1,25 +1,119 @@
|
|||
--- a/nl80211.h
|
||||
+++ b/nl80211.h
|
||||
@@ -1555,6 +1555,9 @@ enum nl80211_commands {
|
||||
@@ -303,8 +303,9 @@
|
||||
* passed, all channels allowed for the current regulatory domain
|
||||
* are used. Extra IEs can also be passed from the userspace by
|
||||
* using the %NL80211_ATTR_IE attribute.
|
||||
- * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan. Returns -ENOENT
|
||||
- * if scheduled scan is not running.
|
||||
+ * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan. Returns -ENOENT if
|
||||
+ * scheduled scan is not running. The caller may assume that as soon
|
||||
+ * as the call returns, it is safe to start a new scheduled scan again.
|
||||
* @NL80211_CMD_SCHED_SCAN_RESULTS: indicates that there are scheduled scan
|
||||
* results available.
|
||||
* @NL80211_CMD_SCHED_SCAN_STOPPED: indicates that the scheduled scan has
|
||||
@@ -418,8 +419,18 @@
|
||||
* %NL80211_ATTR_SSID attribute, and can optionally specify the association
|
||||
* IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
|
||||
* %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
|
||||
- * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
|
||||
- * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
|
||||
+ * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
|
||||
+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %NL80211_ATTR_MAC_HINT, and
|
||||
+ * %NL80211_ATTR_WIPHY_FREQ_HINT.
|
||||
+ * If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are
|
||||
+ * restrictions on BSS selection, i.e., they effectively prevent roaming
|
||||
+ * within the ESS. %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT
|
||||
+ * can be included to provide a recommendation of the initial BSS while
|
||||
+ * allowing the driver to roam to other BSSes within the ESS and also to
|
||||
+ * ignore this recommendation if the indicated BSS is not ideal. Only one
|
||||
+ * set of BSSID,frequency parameters is used (i.e., either the enforcing
|
||||
+ * %NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict
|
||||
+ * %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT).
|
||||
* Background scan period can optionally be
|
||||
* specified in %NL80211_ATTR_BG_SCAN_PERIOD,
|
||||
* if not specified default background scan configuration
|
||||
@@ -1555,6 +1566,22 @@ enum nl80211_commands {
|
||||
* data is in the format defined for the payload of the QoS Map Set element
|
||||
* in IEEE Std 802.11-2012, 8.4.2.97.
|
||||
*
|
||||
+ * @NL80211_ATTR_MAC_HINT: MAC address recommendation as initial BSS
|
||||
+ * @NL80211_ATTR_WIPHY_FREQ_HINT: frequency of the recommended initial BSS
|
||||
+ *
|
||||
+ * @NL80211_ATTR_MAX_AP_ASSOC_STA: Device attribute that indicates how many
|
||||
+ * associated stations are supported in AP mode (including P2P GO); u32.
|
||||
+ * Since drivers may not have a fixed limit on the maximum number (e.g.,
|
||||
+ * other concurrent operations may affect this), drivers are allowed to
|
||||
+ * advertise values that cannot always be met. In such cases, an attempt
|
||||
+ * to add a new station entry with @NL80211_CMD_NEW_STATION may fail.
|
||||
+ *
|
||||
+ * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32.
|
||||
+ * As specified in the &enum nl80211_tdls_peer_capability.
|
||||
+ *
|
||||
+ * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
|
||||
+ * transmit power to stay within regulatory limits. u32, dBi.
|
||||
+ *
|
||||
* @NL80211_ATTR_MAX: highest attribute number currently defined
|
||||
* @__NL80211_ATTR_AFTER_LAST: internal use
|
||||
*/
|
||||
@@ -1883,6 +1886,8 @@ enum nl80211_attrs {
|
||||
@@ -1883,6 +1910,15 @@ enum nl80211_attrs {
|
||||
|
||||
NL80211_ATTR_QOS_MAP,
|
||||
|
||||
+ NL80211_ATTR_MAC_HINT,
|
||||
+ NL80211_ATTR_WIPHY_FREQ_HINT,
|
||||
+
|
||||
+ NL80211_ATTR_MAX_AP_ASSOC_STA,
|
||||
+
|
||||
+ NL80211_ATTR_TDLS_PEER_CAPABILITY,
|
||||
+
|
||||
+ NL80211_ATTR_WIPHY_ANTENNA_GAIN,
|
||||
+
|
||||
/* add attributes here, update the policy in nl80211.c */
|
||||
|
||||
__NL80211_ATTR_AFTER_LAST,
|
||||
@@ -2442,9 +2447,15 @@ enum nl80211_reg_rule_attr {
|
||||
@@ -2304,6 +2340,7 @@ enum nl80211_band_attr {
|
||||
* @NL80211_FREQUENCY_ATTR_NO_160MHZ: any 160 MHz (but not 80+80) channel
|
||||
* using this channel as the primary or any of the secondary channels
|
||||
* isn't possible
|
||||
+ * @NL80211_FREQUENCY_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
|
||||
* @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
|
||||
* currently defined
|
||||
* @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
|
||||
@@ -2322,6 +2359,7 @@ enum nl80211_frequency_attr {
|
||||
NL80211_FREQUENCY_ATTR_NO_HT40_PLUS,
|
||||
NL80211_FREQUENCY_ATTR_NO_80MHZ,
|
||||
NL80211_FREQUENCY_ATTR_NO_160MHZ,
|
||||
+ NL80211_FREQUENCY_ATTR_DFS_CAC_TIME,
|
||||
|
||||
/* keep last */
|
||||
__NL80211_FREQUENCY_ATTR_AFTER_LAST,
|
||||
@@ -2412,12 +2450,14 @@ enum nl80211_reg_type {
|
||||
* in KHz. This is not a center a frequency but an actual regulatory
|
||||
* band edge.
|
||||
* @NL80211_ATTR_FREQ_RANGE_MAX_BW: maximum allowed bandwidth for this
|
||||
- * frequency range, in KHz.
|
||||
+ * frequency range, in KHz.
|
||||
* @NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN: the maximum allowed antenna gain
|
||||
* for a given frequency range. The value is in mBi (100 * dBi).
|
||||
* If you don't have one then don't send this.
|
||||
* @NL80211_ATTR_POWER_RULE_MAX_EIRP: the maximum allowed EIRP for
|
||||
* a given frequency range. The value is in mBm (100 * dBm).
|
||||
+ * @NL80211_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
|
||||
+ * If not present or 0 default CAC time will be used.
|
||||
* @NL80211_REG_RULE_ATTR_MAX: highest regulatory rule attribute number
|
||||
* currently defined
|
||||
* @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use
|
||||
@@ -2433,6 +2473,8 @@ enum nl80211_reg_rule_attr {
|
||||
NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN,
|
||||
NL80211_ATTR_POWER_RULE_MAX_EIRP,
|
||||
|
||||
+ NL80211_ATTR_DFS_CAC_TIME,
|
||||
+
|
||||
/* keep last */
|
||||
__NL80211_REG_RULE_ATTR_AFTER_LAST,
|
||||
NL80211_REG_RULE_ATTR_MAX = __NL80211_REG_RULE_ATTR_AFTER_LAST - 1
|
||||
@@ -2442,9 +2484,15 @@ enum nl80211_reg_rule_attr {
|
||||
* enum nl80211_sched_scan_match_attr - scheduled scan match attributes
|
||||
* @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
|
||||
* @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
|
||||
|
|
@ -37,3 +131,92 @@
|
|||
* @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
|
||||
* attribute number currently defined
|
||||
* @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
|
||||
@@ -2477,6 +2525,9 @@ enum nl80211_sched_scan_match_attr {
|
||||
* @NL80211_RRF_NO_IR: no mechanisms that initiate radiation are allowed,
|
||||
* this includes probe requests or modes of operation that require
|
||||
* beaconing.
|
||||
+ * @NL80211_RRF_AUTO_BW: maximum available bandwidth should be calculated
|
||||
+ * base on contiguous rules and wider channels will be allowed to cross
|
||||
+ * multiple contiguous/overlapping frequency ranges.
|
||||
*/
|
||||
enum nl80211_reg_rule_flags {
|
||||
NL80211_RRF_NO_OFDM = 1<<0,
|
||||
@@ -2488,6 +2539,7 @@ enum nl80211_reg_rule_flags {
|
||||
NL80211_RRF_PTMP_ONLY = 1<<6,
|
||||
NL80211_RRF_NO_IR = 1<<7,
|
||||
__NL80211_RRF_NO_IBSS = 1<<8,
|
||||
+ NL80211_RRF_AUTO_BW = 1<<11,
|
||||
};
|
||||
|
||||
#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
|
||||
@@ -3131,6 +3183,7 @@ enum nl80211_key_attributes {
|
||||
* in an array of MCS numbers.
|
||||
* @NL80211_TXRATE_VHT: VHT rates allowed for TX rate selection,
|
||||
* see &struct nl80211_txrate_vht
|
||||
+ * @NL80211_TXRATE_GI: configure GI, see &enum nl80211_txrate_gi
|
||||
* @__NL80211_TXRATE_AFTER_LAST: internal
|
||||
* @NL80211_TXRATE_MAX: highest TX rate attribute
|
||||
*/
|
||||
@@ -3139,6 +3192,7 @@ enum nl80211_tx_rate_attributes {
|
||||
NL80211_TXRATE_LEGACY,
|
||||
NL80211_TXRATE_HT,
|
||||
NL80211_TXRATE_VHT,
|
||||
+ NL80211_TXRATE_GI,
|
||||
|
||||
/* keep last */
|
||||
__NL80211_TXRATE_AFTER_LAST,
|
||||
@@ -3156,6 +3210,12 @@ struct nl80211_txrate_vht {
|
||||
__u16 mcs[NL80211_VHT_NSS_MAX];
|
||||
};
|
||||
|
||||
+enum nl80211_txrate_gi {
|
||||
+ NL80211_TXRATE_DEFAULT_GI,
|
||||
+ NL80211_TXRATE_FORCE_SGI,
|
||||
+ NL80211_TXRATE_FORCE_LGI,
|
||||
+};
|
||||
+
|
||||
/**
|
||||
* enum nl80211_band - Frequency band
|
||||
* @NL80211_BAND_2GHZ: 2.4 GHz ISM band
|
||||
@@ -3801,11 +3861,6 @@ 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.
|
||||
* @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of
|
||||
* equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station
|
||||
* mode
|
||||
@@ -3847,7 +3902,7 @@ enum nl80211_feature_flags {
|
||||
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,
|
||||
+ /* bit 4 is reserved - don't use */
|
||||
NL80211_FEATURE_SAE = 1 << 5,
|
||||
NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6,
|
||||
NL80211_FEATURE_SCAN_FLUSH = 1 << 7,
|
||||
@@ -4037,4 +4092,20 @@ struct nl80211_vendor_cmd_info {
|
||||
__u32 subcmd;
|
||||
};
|
||||
|
||||
+/**
|
||||
+ * enum nl80211_tdls_peer_capability - TDLS peer flags.
|
||||
+ *
|
||||
+ * Used by tdls_mgmt() to determine which conditional elements need
|
||||
+ * to be added to TDLS Setup frames.
|
||||
+ *
|
||||
+ * @NL80211_TDLS_PEER_HT: TDLS peer is HT capable.
|
||||
+ * @NL80211_TDLS_PEER_VHT: TDLS peer is VHT capable.
|
||||
+ * @NL80211_TDLS_PEER_WMM: TDLS peer is WMM capable.
|
||||
+ */
|
||||
+enum nl80211_tdls_peer_capability {
|
||||
+ NL80211_TDLS_PEER_HT = 1<<0,
|
||||
+ NL80211_TDLS_PEER_VHT = 1<<1,
|
||||
+ NL80211_TDLS_PEER_WMM = 1<<2,
|
||||
+};
|
||||
+
|
||||
#endif /* __LINUX_NL80211_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue