History

Merge tag 'mac80211-next-for-net-next-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says: ==================== One batch of changes, containing: * hwsim improvements from Jouni and myself, to be able to test more scenarios easily * some more HE (802.11ax) support * some initial S1G (sub 1 GHz) work for fractional MHz channels * some (action) frame registration updates to help DPP support * along with other various improvements/fixes ====================

David S. Miller committed 6 years ago

Commit 745bd6f2 parents 0e34811 60689de49 files · +873 −442Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+23−0
@@ -687,6 +687,10 @@ · 686 unmodified lines
687687 * four bytes for vendor frames including the OUI. The registration
688688 * cannot be dropped, but is removed automatically when the netlink
689689 * socket is closed. Multiple registrations can be made.
690+ * The %NL80211_ATTR_RECEIVE_MULTICAST flag attribute can be given if
691+ * %NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS is available, in which
692+ * case the registration can also be modified to include/exclude the
693+ * flag, rather than requiring unregistration to change it.
690694 * @NL80211_CMD_REGISTER_ACTION: Alias for @NL80211_CMD_REGISTER_FRAME for
691695 * backward compatibility
692696 * @NL80211_CMD_FRAME: Management frame TX request and RX notification. This
@@ -1151,6 +1155,11 @@ · 458 unmodified lines
11511155 * @NL80211_CMD_SET_TID_CONFIG: Data frame TID specific configuration
11521156 * is passed using %NL80211_ATTR_TID_CONFIG attribute.
11531157 *
1158+ * @NL80211_CMD_UNPROT_BEACON: Unprotected or incorrectly protected Beacon
1159+ * frame. This event is used to indicate that a received Beacon frame was
1160+ * dropped because it did not include a valid MME MIC while beacon
1161+ * protection was enabled (BIGTK configured in station mode).
1162+ *
11541163 * @NL80211_CMD_MAX: highest used command number
11551164 * @__NL80211_CMD_AFTER_LAST: internal use
11561165 */
@@ -1377,6 +1386,8 @@ enum nl80211_commands { · 220 unmodified lines
13771386
13781387 NL80211_CMD_SET_TID_CONFIG,
13791388
1389+ NL80211_CMD_UNPROT_BEACON,
1390+
13801391 /* add new commands above here */
13811392
13821393 /* used to define NL80211_CMD_MAX below */
@@ -2470,6 +2481,9 @@ enum nl80211_commands { · 1087 unmodified lines
24702481 * no roaming occurs between the reauth threshold and PMK expiration,
24712482 * disassociation is still forced.
24722483 *
2484+ * @NL80211_ATTR_RECEIVE_MULTICAST: multicast flag for the
2485+ * %NL80211_CMD_REGISTER_FRAME command, see the description there.
2486+ *
24732487 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
24742488 * @NL80211_ATTR_MAX: highest attribute number currently defined
24752489 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2945,6 +2959,8 @@ enum nl80211_attrs { · 469 unmodified lines
29452959 NL80211_ATTR_PMK_LIFETIME,
29462960 NL80211_ATTR_PMK_REAUTH_THRESHOLD,
29472961
2962+ NL80211_ATTR_RECEIVE_MULTICAST,
2963+
29482964 /* add attributes here, update the policy in nl80211.c */
29492965
29502966 __NL80211_ATTR_AFTER_LAST,
@@ -5674,6 +5690,8 @@ enum nl80211_feature_flags { · 2723 unmodified lines
56745690 *
56755691 * @NL80211_EXT_FEATURE_BEACON_PROTECTION: The driver supports Beacon protection
56765692 * and can receive key configuration for BIGTK using key indexes 6 and 7.
5693+ * @NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT: The driver supports Beacon
5694+ * protection as a client only and cannot transmit protected beacons.
56775695 *
56785696 * @NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH: The driver can disable the
56795697 * forwarding of preauth frames over the control port. They are then
@@ -5684,6 +5702,9 @@ enum nl80211_feature_flags { · 4 unmodified lines
56845702 * @NL80211_EXT_FEATURE_DEL_IBSS_STA: The driver supports removing stations
56855703 * in IBSS mode, essentially by dropping their state.
56865704 *
5705+ * @NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS: management frame registrations
5706+ * are possible for multicast frames and those will be reported properly.
5707+ *
56875708 * @NUM_NL80211_EXT_FEATURES: number of extended features.
56885709 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
56895710 */
@@ -5735,6 +5756,8 @@ enum nl80211_ext_feature_index { · 45 unmodified lines
57355756 NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH,
57365757 NL80211_EXT_FEATURE_PROTECTED_TWT,
57375758 NL80211_EXT_FEATURE_DEL_IBSS_STA,
5759+ NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS,
5760+ NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT,
57385761
57395762 /* add new features before the definition below */
57405763 NUM_NL80211_EXT_FEATURES,