jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Sync with mac80211-next.git include/uapi/linux/nl80211.h

Browse source 
This brings in nl80211 definitions as of 2020-02-24.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2020-02-24 12:20:05 +02:00
parent 0f84a93f65
commit 2e34f6a53f
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/drivers/nl80211_copy.h
View file

@ -1039,14 +1039,11 @@
* a control port frame and as a notification that a control port frame * a control port frame and as a notification that a control port frame
* has been received. %NL80211_ATTR_FRAME is used to specify the * has been received. %NL80211_ATTR_FRAME is used to specify the
* frame contents. The frame is the raw EAPoL data, without ethernet or * frame contents. The frame is the raw EAPoL data, without ethernet or
* 802.11 headers. An optional %NL80211_ATTR_SRC_MAC can be used to send * 802.11 headers.
* pre-auth frames to STAs on behalf of other APs.
* When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, * When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
* %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added
* indicating the protocol type of the received frame; whether the frame * indicating the protocol type of the received frame; whether the frame
* was received unencrypted and the MAC address of the peer respectively. * was received unencrypted and the MAC address of the peer respectively.
* %NL80211_ATTR_DST_MAC can be used to forward pre-auth frames in
* userspace while using AP mode.
* *
* @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded. * @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded.
* *
@ -2412,9 +2409,6 @@ enum nl80211_commands {
* %NL80211_ATTR_AKM_SUITES are default capabilities if AKM suites not * %NL80211_ATTR_AKM_SUITES are default capabilities if AKM suites not
* advertised for a specific interface type. * advertised for a specific interface type.
* *
* @NL80211_ATTR_SRC_MAC: MAC address used in control port over nl80211 transmit
* @NL80211_ATTR_DST_MAC: MAC address used in control port over nl80211 receive
*
* @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NUM_NL80211_ATTR: total number of nl80211_attrs available
* @NL80211_ATTR_MAX: highest attribute number currently defined * @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use * @__NL80211_ATTR_AFTER_LAST: internal use
@ -2883,9 +2877,6 @@ enum nl80211_attrs {
NL80211_ATTR_IFTYPE_AKM_SUITES, NL80211_ATTR_IFTYPE_AKM_SUITES,
NL80211_ATTR_SRC_MAC,
NL80211_ATTR_DST_MAC,
/* add attributes here, update the policy in nl80211.c */ /* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST, __NL80211_ATTR_AFTER_LAST,
@ -4559,6 +4550,7 @@ enum nl80211_key_default_types {
* See &enum nl80211_key_default_types. * See &enum nl80211_key_default_types.
* @NL80211_KEY_MODE: the mode from enum nl80211_key_mode. * @NL80211_KEY_MODE: the mode from enum nl80211_key_mode.
* Defaults to @NL80211_KEY_RX_TX. * Defaults to @NL80211_KEY_RX_TX.
* @NL80211_KEY_DEFAULT_BEACON: flag indicating default Beacon frame key
* *
* @__NL80211_KEY_AFTER_LAST: internal * @__NL80211_KEY_AFTER_LAST: internal
* @NL80211_KEY_MAX: highest key attribute * @NL80211_KEY_MAX: highest key attribute
@ -4574,6 +4566,7 @@ enum nl80211_key_attributes {
NL80211_KEY_TYPE, NL80211_KEY_TYPE,
NL80211_KEY_DEFAULT_TYPES, NL80211_KEY_DEFAULT_TYPES,
NL80211_KEY_MODE, NL80211_KEY_MODE,
NL80211_KEY_DEFAULT_BEACON,
/* keep last */ /* keep last */
__NL80211_KEY_AFTER_LAST, __NL80211_KEY_AFTER_LAST,
@ -5548,9 +5541,8 @@ enum nl80211_feature_flags {
* feature, which prevents bufferbloat by using the expected transmission * feature, which prevents bufferbloat by using the expected transmission
* time to limit the amount of data buffered in the hardware. * time to limit the amount of data buffered in the hardware.
* *
* @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS: The driver * @NL80211_EXT_FEATURE_BEACON_PROTECTION: The driver supports Beacon protection
* can use src and dst MAC addresses with control port over nl80211 rx * and can receive key configuration for BIGTK using key indexes 6 and 7.
* and tx operations.
* *
* @NUM_NL80211_EXT_FEATURES: number of extended features. * @NUM_NL80211_EXT_FEATURES: number of extended features.
* @MAX_NL80211_EXT_FEATURES: highest extended feature index. * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@ -5599,7 +5591,7 @@ enum nl80211_ext_feature_index {
NL80211_EXT_FEATURE_SAE_OFFLOAD, NL80211_EXT_FEATURE_SAE_OFFLOAD,
NL80211_EXT_FEATURE_VLAN_OFFLOAD, NL80211_EXT_FEATURE_VLAN_OFFLOAD,
NL80211_EXT_FEATURE_AQL, NL80211_EXT_FEATURE_AQL,
NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS, NL80211_EXT_FEATURE_BEACON_PROTECTION,
/* add new features before the definition below */ /* add new features before the definition below */
NUM_NL80211_EXT_FEATURES, NUM_NL80211_EXT_FEATURES,