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 (1 of 45 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+64−5
@@ -600,6 +600,20 @@ · 599 unmodified lines
600600 *
601601 * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface.
602602 *
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+ *
603617 * @NL80211_CMD_JOIN_MESH: Join a mesh. The mesh ID must be given, and initial
604618 * mesh config parameters may be given.
605619 * @NL80211_CMD_LEAVE_MESH: Leave the mesh network -- no special arguments, the
@@ -874,6 +888,12 @@ · 268 unmodified lines
874888 * This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and
875889 * %NL80211_ATTR_COOKIE.
876890 *
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+ *
877897 * @NL80211_CMD_MAX: highest used command number
878898 * @__NL80211_CMD_AFTER_LAST: internal use
879899 */
@@ -1069,6 +1089,10 @@ enum nl80211_commands { · 189 unmodified lines
10691089 NL80211_CMD_CHANGE_NAN_CONFIG,
10701090 NL80211_CMD_NAN_MATCH,
10711091
1092+ NL80211_CMD_SET_MULTICAST_TO_UNICAST,
1093+
1094+ NL80211_CMD_UPDATE_CONNECT_PARAMS,
1095+
10721096 /* add new commands above here */
10731097
10741098 /* used to define NL80211_CMD_MAX below */
@@ -1638,8 +1662,16 @@ enum nl80211_commands { · 563 unmodified lines
16381662 * the connection request from a station. nl80211_connect_failed_reason
16391663 * enum has different reasons of connection failure.
16401664 *
1641− * @NL80211_ATTR_SAE_DATA: SAE elements in Authentication frames. This starts
1642− * with the Authentication transaction sequence number field.
1665+ * @NL80211_ATTR_AUTH_DATA: Fields and elements in Authentication frames.
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.
16431675 *
16441676 * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from
16451677 * association request when used with NL80211_CMD_NEW_STATION)
@@ -1936,6 +1968,14 @@ enum nl80211_commands { · 290 unmodified lines
19361968 * attribute.
19371969 * @NL80211_ATTR_NAN_MATCH: used to report a match. This is a nested attribute.
19381970 * 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).
19391979 *
19401980 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
19411981 * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2195,7 +2235,7 @@ enum nl80211_attrs { · 253 unmodified lines
21952235
21962236 NL80211_ATTR_CONN_FAILED_REASON,
21972237
2198− NL80211_ATTR_SAE_DATA,
2238+ NL80211_ATTR_AUTH_DATA,
21992239
22002240 NL80211_ATTR_VHT_CAPABILITY,
22012241
@@ -2336,6 +2376,11 @@ enum nl80211_attrs { · 134 unmodified lines
23362376 NL80211_ATTR_NAN_FUNC,
23372377 NL80211_ATTR_NAN_MATCH,
23382378
2379+ NL80211_ATTR_FILS_KEK,
2380+ NL80211_ATTR_FILS_NONCES,
2381+
2382+ NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED,
2383+
23392384 /* add attributes here, update the policy in nl80211.c */
23402385
23412386 __NL80211_ATTR_AFTER_LAST,
@@ -2347,6 +2392,7 @@ enum nl80211_attrs { · 5 unmodified lines
23472392 #define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
23482393 #define NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG
23492394 #define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER
2395+#define NL80211_ATTR_SAE_DATA NL80211_ATTR_AUTH_DATA
23502396
23512397 /*
23522398 * Allow user space programs to use #ifdef on new attributes by defining them
@@ -3660,6 +3706,9 @@ enum nl80211_bss_status { · 1307 unmodified lines
36603706 * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
36613707 * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
36623708 * @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
36633712 * @__NL80211_AUTHTYPE_NUM: internal
36643713 * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm
36653714 * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
@@ -3672,6 +3721,9 @@ enum nl80211_auth_type { · 6 unmodified lines
36723721 NL80211_AUTHTYPE_FT,
36733722 NL80211_AUTHTYPE_NETWORK_EAP,
36743723 NL80211_AUTHTYPE_SAE,
3724+ NL80211_AUTHTYPE_FILS_SK,
3725+ NL80211_AUTHTYPE_FILS_SK_PFS,
3726+ NL80211_AUTHTYPE_FILS_PK,
36753727
36763728 /* keep last */
36773729 __NL80211_AUTHTYPE_NUM,
@@ -4280,6 +4332,9 @@ enum nl80211_iface_limit_attrs { · 602 unmodified lines
42804332 * of supported channel widths for radar detection.
42814333 * @NL80211_IFACE_COMB_RADAR_DETECT_REGIONS: u32 attribute containing the bitmap
42824334 * 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).
42834338 * @NUM_NL80211_IFACE_COMB: number of attributes
42844339 * @MAX_NL80211_IFACE_COMB: highest attribute number
42854340 *
@@ -4287,8 +4342,8 @@ enum nl80211_iface_limit_attrs { · 1 unmodified line
42874342 * limits = [ #{STA} <= 1, #{AP} <= 1 ], matching BI, channels = 1, max = 2
42884343 * => allows an AP and a STA that must match BIs
42894344 *
4290− * numbers = [ #{AP, P2P-GO} <= 8 ], channels = 1, max = 8
4291− * => allows 8 of AP/GO
4345+ * numbers = [ #{AP, P2P-GO} <= 8 ], BI min gcd, channels = 1, max = 8,
4346+ * => allows 8 of AP/GO that can have BI gcd >= min gcd
42924347 *
42934348 * numbers = [ #{STA} <= 2 ], channels = 2, max = 2
42944349 * => allows two STAs on different channels
@@ -4314,6 +4369,7 @@ enum nl80211_if_combination_attrs { · 19 unmodified lines
43144369 NL80211_IFACE_COMB_NUM_CHANNELS,
43154370 NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
43164371 NL80211_IFACE_COMB_RADAR_DETECT_REGIONS,
4372+ NL80211_IFACE_COMB_BI_MIN_GCD,
43174373
43184374 /* keep last */
43194375 NUM_NL80211_IFACE_COMB,
@@ -4634,6 +4690,8 @@ enum nl80211_feature_flags { · 314 unmodified lines
46344690 * configuration (AP/mesh) with HT rates.
46354691 * @NL80211_EXT_FEATURE_BEACON_RATE_VHT: Driver supports beacon rate
46364692 * 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.
46374695 *
46384696 * @NUM_NL80211_EXT_FEATURES: number of extended features.
46394697 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -4648,6 +4706,7 @@ enum nl80211_ext_feature_index { · 8 unmodified lines
46484706 NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
46494707 NL80211_EXT_FEATURE_BEACON_RATE_HT,
46504708 NL80211_EXT_FEATURE_BEACON_RATE_VHT,
4709+ NL80211_EXT_FEATURE_FILS_STA,
46514710
46524711 /* add new features before the definition below */
46534712 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