History

Merge tag 'mac80211-next-for-davem-2016-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says: ==================== Among various cleanups and improvements, we have the following: * client FILS authentication support in mac80211 (Jouni) * AP/VLAN multicast improvements (Michael Braun) * config/advertising support for differing beacon intervals on multiple virtual interfaces (Purushottam Kushwaha, myself) * deprecate the old WDS mode for cfg80211-based drivers, the mode is hardly usable since it doesn't support any "modern" features like WPA encryption (2003), HT (2009) or VHT (2014), I'm not even sure WEP (introduced in 1997) could be done. ====================

David S. Miller committed 10 years ago

Commit 32ab0a32 parents 9769905 514877145 files · +1383 −421Browse files

Showing the changes to include/uapi/linux (1 of 45 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+64−5
@@ -600,6 +600,20 @@ · 599 unmodified lines
600 *600 *
601 * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface.601 * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface.
602 *602 *
603 * @NL80211_CMD_SET_MULTICAST_TO_UNICAST: Configure if this AP should perform
604 * multicast to unicast conversion. When enabled, all multicast packets
605 * with ethertype ARP, IPv4 or IPv6 (possibly within an 802.1Q header)
606 * will be sent out to each station once with the destination (multicast)
607 * MAC address replaced by the station's MAC address. Note that this may
608 * break certain expectations of the receiver, e.g. the ability to drop
609 * unicast IP packets encapsulated in multicast L2 frames, or the ability
610 * to not send destination unreachable messages in such cases.
611 * This can only be toggled per BSS. Configure this on an interface of
612 * type %NL80211_IFTYPE_AP. It applies to all its VLAN interfaces
613 * (%NL80211_IFTYPE_AP_VLAN), except for those in 4addr (WDS) mode.
614 * If %NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED is not present with this
615 * command, the feature is disabled.
616 *
603 * @NL80211_CMD_JOIN_MESH: Join a mesh. The mesh ID must be given, and initial617 * @NL80211_CMD_JOIN_MESH: Join a mesh. The mesh ID must be given, and initial
604 * mesh config parameters may be given.618 * mesh config parameters may be given.
605 * @NL80211_CMD_LEAVE_MESH: Leave the mesh network -- no special arguments, the619 * @NL80211_CMD_LEAVE_MESH: Leave the mesh network -- no special arguments, the
@@ -874,6 +888,12 @@ · 268 unmodified lines
874 * This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and888 * This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and
875 * %NL80211_ATTR_COOKIE.889 * %NL80211_ATTR_COOKIE.
876 *890 *
891 * @NL80211_CMD_UPDATE_CONNECT_PARAMS: Update one or more connect parameters
892 * for subsequent roaming cases if the driver or firmware uses internal
893 * BSS selection. This command can be issued only while connected and it
894 * does not result in a change for the current association. Currently,
895 * only the %NL80211_ATTR_IE data is used and updated with this command.
896 *
877 * @NL80211_CMD_MAX: highest used command number897 * @NL80211_CMD_MAX: highest used command number
878 * @__NL80211_CMD_AFTER_LAST: internal use898 * @__NL80211_CMD_AFTER_LAST: internal use
879 */899 */
@@ -1069,6 +1089,10 @@ enum nl80211_commands { · 189 unmodified lines
1069 NL80211_CMD_CHANGE_NAN_CONFIG,1089 NL80211_CMD_CHANGE_NAN_CONFIG,
1070 NL80211_CMD_NAN_MATCH,1090 NL80211_CMD_NAN_MATCH,
1071 1091
1092 NL80211_CMD_SET_MULTICAST_TO_UNICAST,
1093
1094 NL80211_CMD_UPDATE_CONNECT_PARAMS,
1095
1072 /* add new commands above here */1096 /* add new commands above here */
1073 1097
1074 /* used to define NL80211_CMD_MAX below */1098 /* used to define NL80211_CMD_MAX below */
@@ -1638,8 +1662,16 @@ enum nl80211_commands { · 563 unmodified lines
1638 * the connection request from a station. nl80211_connect_failed_reason1662 * the connection request from a station. nl80211_connect_failed_reason
1639 * enum has different reasons of connection failure.1663 * enum has different reasons of connection failure.
1640 *1664 *
1641 * @NL80211_ATTR_SAE_DATA: SAE elements in Authentication frames. This starts1665 * @NL80211_ATTR_AUTH_DATA: Fields and elements in Authentication frames.
1642 * with the Authentication transaction sequence number field.1666 * This contains the authentication frame body (non-IE and IE data),
1667 * excluding the Authentication algorithm number, i.e., starting at the
1668 * Authentication transaction sequence number field. It is used with
1669 * authentication algorithms that need special fields to be added into
1670 * the frames (SAE and FILS). Currently, only the SAE cases use the
1671 * initial two fields (Authentication transaction sequence number and
1672 * Status code). However, those fields are included in the attribute data
1673 * for all authentication algorithms to keep the attribute definition
1674 * consistent.
1643 *1675 *
1644 * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from1676 * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from
1645 * association request when used with NL80211_CMD_NEW_STATION)1677 * association request when used with NL80211_CMD_NEW_STATION)
@@ -1936,6 +1968,14 @@ enum nl80211_commands { · 290 unmodified lines
1936 * attribute.1968 * attribute.
1937 * @NL80211_ATTR_NAN_MATCH: used to report a match. This is a nested attribute.1969 * @NL80211_ATTR_NAN_MATCH: used to report a match. This is a nested attribute.
1938 * See &enum nl80211_nan_match_attributes.1970 * See &enum nl80211_nan_match_attributes.
1971 * @NL80211_ATTR_FILS_KEK: KEK for FILS (Re)Association Request/Response frame
1972 * protection.
1973 * @NL80211_ATTR_FILS_NONCES: Nonces (part of AAD) for FILS (Re)Association
1974 * Request/Response frame protection. This attribute contains the 16 octet
1975 * STA Nonce followed by 16 octets of AP Nonce.
1976 *
1977 * @NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED: Indicates whether or not multicast
1978 * packets should be send out as unicast to all stations (flag attribute).
1939 *1979 *
1940 * @NUM_NL80211_ATTR: total number of nl80211_attrs available1980 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
1941 * @NL80211_ATTR_MAX: highest attribute number currently defined1981 * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2195,7 +2235,7 @@ enum nl80211_attrs { · 253 unmodified lines
2195 2235
2196 NL80211_ATTR_CONN_FAILED_REASON,2236 NL80211_ATTR_CONN_FAILED_REASON,
2197 2237
2198 NL80211_ATTR_SAE_DATA,2238 NL80211_ATTR_AUTH_DATA,
2199 2239
2200 NL80211_ATTR_VHT_CAPABILITY,2240 NL80211_ATTR_VHT_CAPABILITY,
2201 2241
@@ -2336,6 +2376,11 @@ enum nl80211_attrs { · 134 unmodified lines
2336 NL80211_ATTR_NAN_FUNC,2376 NL80211_ATTR_NAN_FUNC,
2337 NL80211_ATTR_NAN_MATCH,2377 NL80211_ATTR_NAN_MATCH,
2338 2378
2379 NL80211_ATTR_FILS_KEK,
2380 NL80211_ATTR_FILS_NONCES,
2381
2382 NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED,
2383
2339 /* add attributes here, update the policy in nl80211.c */2384 /* add attributes here, update the policy in nl80211.c */
2340 2385
2341 __NL80211_ATTR_AFTER_LAST,2386 __NL80211_ATTR_AFTER_LAST,
@@ -2347,6 +2392,7 @@ enum nl80211_attrs { · 5 unmodified lines
2347#define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION2392#define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
2348#define NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG2393#define NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG
2349#define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER2394#define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER
2395#define NL80211_ATTR_SAE_DATA NL80211_ATTR_AUTH_DATA
2350 2396
2351/*2397/*
2352 * Allow user space programs to use #ifdef on new attributes by defining them2398 * Allow user space programs to use #ifdef on new attributes by defining them
@@ -3660,6 +3706,9 @@ enum nl80211_bss_status { · 1307 unmodified lines
3660 * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)3706 * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
3661 * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)3707 * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
3662 * @NL80211_AUTHTYPE_SAE: Simultaneous authentication of equals3708 * @NL80211_AUTHTYPE_SAE: Simultaneous authentication of equals
3709 * @NL80211_AUTHTYPE_FILS_SK: Fast Initial Link Setup shared key
3710 * @NL80211_AUTHTYPE_FILS_SK_PFS: Fast Initial Link Setup shared key with PFS
3711 * @NL80211_AUTHTYPE_FILS_PK: Fast Initial Link Setup public key
3663 * @__NL80211_AUTHTYPE_NUM: internal3712 * @__NL80211_AUTHTYPE_NUM: internal
3664 * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm3713 * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm
3665 * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by3714 * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
@@ -3672,6 +3721,9 @@ enum nl80211_auth_type { · 6 unmodified lines
3672 NL80211_AUTHTYPE_FT,3721 NL80211_AUTHTYPE_FT,
3673 NL80211_AUTHTYPE_NETWORK_EAP,3722 NL80211_AUTHTYPE_NETWORK_EAP,
3674 NL80211_AUTHTYPE_SAE,3723 NL80211_AUTHTYPE_SAE,
3724 NL80211_AUTHTYPE_FILS_SK,
3725 NL80211_AUTHTYPE_FILS_SK_PFS,
3726 NL80211_AUTHTYPE_FILS_PK,
3675 3727
3676 /* keep last */3728 /* keep last */
3677 __NL80211_AUTHTYPE_NUM,3729 __NL80211_AUTHTYPE_NUM,
@@ -4280,6 +4332,9 @@ enum nl80211_iface_limit_attrs { · 602 unmodified lines
4280 * of supported channel widths for radar detection.4332 * of supported channel widths for radar detection.
4281 * @NL80211_IFACE_COMB_RADAR_DETECT_REGIONS: u32 attribute containing the bitmap4333 * @NL80211_IFACE_COMB_RADAR_DETECT_REGIONS: u32 attribute containing the bitmap
4282 * of supported regulatory regions for radar detection.4334 * of supported regulatory regions for radar detection.
4335 * @NL80211_IFACE_COMB_BI_MIN_GCD: u32 attribute specifying the minimum GCD of
4336 * different beacon intervals supported by all the interface combinations
4337 * in this group (if not present, all beacon intervals be identical).
4283 * @NUM_NL80211_IFACE_COMB: number of attributes4338 * @NUM_NL80211_IFACE_COMB: number of attributes
4284 * @MAX_NL80211_IFACE_COMB: highest attribute number4339 * @MAX_NL80211_IFACE_COMB: highest attribute number
4285 *4340 *
@@ -4287,8 +4342,8 @@ enum nl80211_iface_limit_attrs { · 1 unmodified line
4287 * limits = [ #{STA} <= 1, #{AP} <= 1 ], matching BI, channels = 1, max = 24342 * limits = [ #{STA} <= 1, #{AP} <= 1 ], matching BI, channels = 1, max = 2
4288 * => allows an AP and a STA that must match BIs4343 * => allows an AP and a STA that must match BIs
4289 *4344 *
4290 * numbers = [ #{AP, P2P-GO} <= 8 ], channels = 1, max = 84345 * numbers = [ #{AP, P2P-GO} <= 8 ], BI min gcd, channels = 1, max = 8,
4291 * => allows 8 of AP/GO4346 * => allows 8 of AP/GO that can have BI gcd >= min gcd
4292 *4347 *
4293 * numbers = [ #{STA} <= 2 ], channels = 2, max = 24348 * numbers = [ #{STA} <= 2 ], channels = 2, max = 2
4294 * => allows two STAs on different channels4349 * => allows two STAs on different channels
@@ -4314,6 +4369,7 @@ enum nl80211_if_combination_attrs { · 19 unmodified lines
4314 NL80211_IFACE_COMB_NUM_CHANNELS,4369 NL80211_IFACE_COMB_NUM_CHANNELS,
4315 NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,4370 NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
4316 NL80211_IFACE_COMB_RADAR_DETECT_REGIONS,4371 NL80211_IFACE_COMB_RADAR_DETECT_REGIONS,
4372 NL80211_IFACE_COMB_BI_MIN_GCD,
4317 4373
4318 /* keep last */4374 /* keep last */
4319 NUM_NL80211_IFACE_COMB,4375 NUM_NL80211_IFACE_COMB,
@@ -4634,6 +4690,8 @@ enum nl80211_feature_flags { · 314 unmodified lines
4634 * configuration (AP/mesh) with HT rates.4690 * configuration (AP/mesh) with HT rates.
4635 * @NL80211_EXT_FEATURE_BEACON_RATE_VHT: Driver supports beacon rate4691 * @NL80211_EXT_FEATURE_BEACON_RATE_VHT: Driver supports beacon rate
4636 * configuration (AP/mesh) with VHT rates.4692 * configuration (AP/mesh) with VHT rates.
4693 * @NL80211_EXT_FEATURE_FILS_STA: This driver supports Fast Initial Link Setup
4694 * with user space SME (NL80211_CMD_AUTHENTICATE) in station mode.
4637 *4695 *
4638 * @NUM_NL80211_EXT_FEATURES: number of extended features.4696 * @NUM_NL80211_EXT_FEATURES: number of extended features.
4639 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.4697 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -4648,6 +4706,7 @@ enum nl80211_ext_feature_index { · 8 unmodified lines
4648 NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,4706 NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
4649 NL80211_EXT_FEATURE_BEACON_RATE_HT,4707 NL80211_EXT_FEATURE_BEACON_RATE_HT,
4650 NL80211_EXT_FEATURE_BEACON_RATE_VHT,4708 NL80211_EXT_FEATURE_BEACON_RATE_VHT,
4709 NL80211_EXT_FEATURE_FILS_STA,
4651 4710
4652 /* add new features before the definition below */4711 /* add new features before the definition below */
4653 NUM_NL80211_EXT_FEATURES,4712 NUM_NL80211_EXT_FEATURES,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t