nl80211: Sync with linux/nl80211.h from wireless-testing.git
Note: This changes values for existing NL80211_ATTR_MAX_SCAN_IE_LEN and NL80211_ATTR_KEY_TYPE (for some reason, they ended up getting swapped in wireless-testing.git) and as such, could break Michael MIC error reporting (well, at least partially).
This commit is contained in:
Jouni Malinen
Jouni Malinen
parent
3ec97afe57
commit
5645fbdc85
1 changed files with 79 additions and 5 deletions
|
|
@ -7,7 +7,7 @@
|
|||
* Copyright 2008 Michael Wu <flamingice@sourmilk.net>
|
||||
* Copyright 2008 Luis Carlos Cobo <luisca@cozybit.com>
|
||||
* Copyright 2008 Michael Buesch <mb@bu3sch.de>
|
||||
* Copyright 2008 Luis R. Rodriguez <lrodriguez@atheros.com>
|
||||
* Copyright 2008, 2009 Luis R. Rodriguez <lrodriguez@atheros.com>
|
||||
* Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
|
||||
* Copyright 2008 Colin McCabe <colin@cozybit.com>
|
||||
*
|
||||
|
|
@ -46,8 +46,10 @@
|
|||
* to get a list of all present wiphys.
|
||||
* @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or
|
||||
* %NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME,
|
||||
* %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ, and/or
|
||||
* %NL80211_ATTR_WIPHY_CHANNEL_TYPE.
|
||||
* %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ,
|
||||
* %NL80211_ATTR_WIPHY_CHANNEL_TYPE, %NL80211_ATTR_WIPHY_RETRY_SHORT,
|
||||
* %NL80211_ATTR_WIPHY_RETRY_LONG, %NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
|
||||
* and/or %NL80211_ATTR_WIPHY_RTS_THRESHOLD.
|
||||
* @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
|
||||
* or rename notification. Has attributes %NL80211_ATTR_WIPHY and
|
||||
* %NL80211_ATTR_WIPHY_NAME.
|
||||
|
|
@ -166,6 +168,22 @@
|
|||
* set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is
|
||||
* %NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on
|
||||
* to (%NL80211_ATTR_REG_ALPHA2).
|
||||
* @NL80211_CMD_REG_BEACON_HINT: indicates to userspace that an AP beacon
|
||||
* has been found while world roaming thus enabling active scan or
|
||||
* any mode of operation that initiates TX (beacons) on a channel
|
||||
* where we would not have been able to do either before. As an example
|
||||
* if you are world roaming (regulatory domain set to world or if your
|
||||
* driver is using a custom world roaming regulatory domain) and while
|
||||
* doing a passive scan on the 5 GHz band you find an AP there (if not
|
||||
* on a DFS channel) you will now be able to actively scan for that AP
|
||||
* or use AP mode on your card on that same channel. Note that this will
|
||||
* never be used for channels 1-11 on the 2 GHz band as they are always
|
||||
* enabled world wide. This beacon hint is only sent if your device had
|
||||
* either disabled active scanning or beaconing on a channel. We send to
|
||||
* userspace the wiphy on which we removed a restriction from
|
||||
* (%NL80211_ATTR_WIPHY) and the channel on which this occurred
|
||||
* before (%NL80211_ATTR_FREQ_BEFORE) and after (%NL80211_ATTR_FREQ_AFTER)
|
||||
* the beacon hint was processed.
|
||||
*
|
||||
* @NL80211_CMD_AUTHENTICATE: authentication request and notification.
|
||||
* This command is used both as a command (request to authenticate) and
|
||||
|
|
@ -207,6 +225,15 @@
|
|||
* %NL80211_ATTR_KEY_SEQ to indicate the TSC value of the frame; this
|
||||
* event matches with MLME-MICHAELMICFAILURE.indication() primitive
|
||||
*
|
||||
* @NL80211_CMD_JOIN_IBSS: Join a new IBSS -- given at least an SSID and a
|
||||
* FREQ attribute (for the initial frequency if no peer can be found)
|
||||
* and optionally a MAC (as BSSID) and FREQ_FIXED attribute if those
|
||||
* should be fixed rather than automatically determined. Can only be
|
||||
* executed on a network interface that is UP, and fixed BSSID/FREQ
|
||||
* may be rejected.
|
||||
* @NL80211_CMD_LEAVE_IBSS: Leave the IBSS -- no special arguments, the IBSS is
|
||||
* determined by the network interface.
|
||||
*
|
||||
* @NL80211_CMD_MAX: highest used command number
|
||||
* @__NL80211_CMD_AFTER_LAST: internal use
|
||||
*/
|
||||
|
|
@ -270,6 +297,11 @@ enum nl80211_commands {
|
|||
|
||||
NL80211_CMD_MICHAEL_MIC_FAILURE,
|
||||
|
||||
NL80211_CMD_REG_BEACON_HINT,
|
||||
|
||||
NL80211_CMD_JOIN_IBSS,
|
||||
NL80211_CMD_LEAVE_IBSS,
|
||||
|
||||
/* add new commands above here */
|
||||
|
||||
/* used to define NL80211_CMD_MAX below */
|
||||
|
|
@ -288,6 +320,7 @@ enum nl80211_commands {
|
|||
#define NL80211_CMD_ASSOCIATE NL80211_CMD_ASSOCIATE
|
||||
#define NL80211_CMD_DEAUTHENTICATE NL80211_CMD_DEAUTHENTICATE
|
||||
#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE
|
||||
#define NL80211_CMD_REG_BEACON_HINT NL80211_CMD_REG_BEACON_HINT
|
||||
|
||||
/**
|
||||
* enum nl80211_attrs - nl80211 netlink attributes
|
||||
|
|
@ -306,6 +339,18 @@ enum nl80211_commands {
|
|||
* NL80211_CHAN_HT20 = HT20 only
|
||||
* NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel
|
||||
* NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel
|
||||
* @NL80211_ATTR_WIPHY_RETRY_SHORT: TX retry limit for frames whose length is
|
||||
* less than or equal to the RTS threshold; allowed range: 1..255;
|
||||
* dot11ShortRetryLimit; u8
|
||||
* @NL80211_ATTR_WIPHY_RETRY_LONG: TX retry limit for frames whose length is
|
||||
* greater than the RTS threshold; allowed range: 1..255;
|
||||
* dot11ShortLongLimit; u8
|
||||
* @NL80211_ATTR_WIPHY_FRAG_THRESHOLD: fragmentation threshold, i.e., maximum
|
||||
* length in octets for frames; allowed range: 256..8000, disable
|
||||
* fragmentation with (u32)-1; dot11FragmentationThreshold; u32
|
||||
* @NL80211_ATTR_WIPHY_RTS_THRESHOLD: RTS threshold (TX frames with length
|
||||
* larger than or equal to this use RTS/CTS handshake); allowed range:
|
||||
* 0..65536, disable with (u32)-1; dot11RTSThreshold; u32
|
||||
*
|
||||
* @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
|
||||
* @NL80211_ATTR_IFNAME: network interface name
|
||||
|
|
@ -423,6 +468,23 @@ enum nl80211_commands {
|
|||
* @NL80211_ATTR_KEY_TYPE: Key Type, see &enum nl80211_key_type, represented as
|
||||
* a u32
|
||||
*
|
||||
* @NL80211_ATTR_FREQ_BEFORE: A channel which has suffered a regulatory change
|
||||
* due to considerations from a beacon hint. This attribute reflects
|
||||
* the state of the channel _before_ the beacon hint processing. This
|
||||
* attributes consists of a nested attribute containing
|
||||
* NL80211_FREQUENCY_ATTR_*
|
||||
* @NL80211_ATTR_FREQ_AFTER: A channel which has suffered a regulatory change
|
||||
* due to considerations from a beacon hint. This attribute reflects
|
||||
* the state of the channel _after_ the beacon hint processing. This
|
||||
* attributes consists of a nested attribute containing
|
||||
* NL80211_FREQUENCY_ATTR_*
|
||||
*
|
||||
* @NL80211_ATTR_CIPHER_SUITES: a set of u32 values indicating the supported
|
||||
* cipher suites
|
||||
*
|
||||
* @NL80211_ATTR_FREQ_FIXED: a flag indicating the IBSS should not try to look
|
||||
* for other networks on different channels
|
||||
*
|
||||
* @NL80211_ATTR_MAX: highest attribute number currently defined
|
||||
* @__NL80211_ATTR_AFTER_LAST: internal use
|
||||
*/
|
||||
|
|
@ -507,10 +569,22 @@ enum nl80211_attrs {
|
|||
NL80211_ATTR_AUTH_TYPE,
|
||||
NL80211_ATTR_REASON_CODE,
|
||||
|
||||
NL80211_ATTR_MAX_SCAN_IE_LEN,
|
||||
|
||||
NL80211_ATTR_KEY_TYPE,
|
||||
|
||||
NL80211_ATTR_MAX_SCAN_IE_LEN,
|
||||
NL80211_ATTR_CIPHER_SUITES,
|
||||
|
||||
NL80211_ATTR_FREQ_BEFORE,
|
||||
NL80211_ATTR_FREQ_AFTER,
|
||||
|
||||
NL80211_ATTR_FREQ_FIXED,
|
||||
|
||||
|
||||
NL80211_ATTR_WIPHY_RETRY_SHORT,
|
||||
NL80211_ATTR_WIPHY_RETRY_LONG,
|
||||
NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
|
||||
NL80211_ATTR_WIPHY_RTS_THRESHOLD,
|
||||
|
||||
/* add attributes here, update the policy in nl80211.c */
|
||||
|
||||
__NL80211_ATTR_AFTER_LAST,
|
||||
|
|
|
|||
Loading…
Reference in a new issue