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
687 * four bytes for vendor frames including the OUI. The registration687 * four bytes for vendor frames including the OUI. The registration
688 * cannot be dropped, but is removed automatically when the netlink688 * cannot be dropped, but is removed automatically when the netlink
689 * socket is closed. Multiple registrations can be made.689 * 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.
690 * @NL80211_CMD_REGISTER_ACTION: Alias for @NL80211_CMD_REGISTER_FRAME for694 * @NL80211_CMD_REGISTER_ACTION: Alias for @NL80211_CMD_REGISTER_FRAME for
691 * backward compatibility695 * backward compatibility
692 * @NL80211_CMD_FRAME: Management frame TX request and RX notification. This696 * @NL80211_CMD_FRAME: Management frame TX request and RX notification. This
@@ -1151,6 +1155,11 @@ · 458 unmodified lines
1151 * @NL80211_CMD_SET_TID_CONFIG: Data frame TID specific configuration1155 * @NL80211_CMD_SET_TID_CONFIG: Data frame TID specific configuration
1152 * is passed using %NL80211_ATTR_TID_CONFIG attribute.1156 * is passed using %NL80211_ATTR_TID_CONFIG attribute.
1153 *1157 *
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 *
1154 * @NL80211_CMD_MAX: highest used command number1163 * @NL80211_CMD_MAX: highest used command number
1155 * @__NL80211_CMD_AFTER_LAST: internal use1164 * @__NL80211_CMD_AFTER_LAST: internal use
1156 */1165 */
@@ -1377,6 +1386,8 @@ enum nl80211_commands { · 220 unmodified lines
1377 1386
1378 NL80211_CMD_SET_TID_CONFIG,1387 NL80211_CMD_SET_TID_CONFIG,
1379 1388
1389 NL80211_CMD_UNPROT_BEACON,
1390
1380 /* add new commands above here */1391 /* add new commands above here */
1381 1392
1382 /* used to define NL80211_CMD_MAX below */1393 /* used to define NL80211_CMD_MAX below */
@@ -2470,6 +2481,9 @@ enum nl80211_commands { · 1087 unmodified lines
2470 * no roaming occurs between the reauth threshold and PMK expiration,2481 * no roaming occurs between the reauth threshold and PMK expiration,
2471 * disassociation is still forced.2482 * disassociation is still forced.
2472 *2483 *
2484 * @NL80211_ATTR_RECEIVE_MULTICAST: multicast flag for the
2485 * %NL80211_CMD_REGISTER_FRAME command, see the description there.
2486 *
2473 * @NUM_NL80211_ATTR: total number of nl80211_attrs available2487 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
2474 * @NL80211_ATTR_MAX: highest attribute number currently defined2488 * @NL80211_ATTR_MAX: highest attribute number currently defined
2475 * @__NL80211_ATTR_AFTER_LAST: internal use2489 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2945,6 +2959,8 @@ enum nl80211_attrs { · 469 unmodified lines
2945 NL80211_ATTR_PMK_LIFETIME,2959 NL80211_ATTR_PMK_LIFETIME,
2946 NL80211_ATTR_PMK_REAUTH_THRESHOLD,2960 NL80211_ATTR_PMK_REAUTH_THRESHOLD,
2947 2961
2962 NL80211_ATTR_RECEIVE_MULTICAST,
2963
2948 /* add attributes here, update the policy in nl80211.c */2964 /* add attributes here, update the policy in nl80211.c */
2949 2965
2950 __NL80211_ATTR_AFTER_LAST,2966 __NL80211_ATTR_AFTER_LAST,
@@ -5674,6 +5690,8 @@ enum nl80211_feature_flags { · 2723 unmodified lines
5674 *5690 *
5675 * @NL80211_EXT_FEATURE_BEACON_PROTECTION: The driver supports Beacon protection5691 * @NL80211_EXT_FEATURE_BEACON_PROTECTION: The driver supports Beacon protection
5676 * and can receive key configuration for BIGTK using key indexes 6 and 7.5692 * 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.
5677 *5695 *
5678 * @NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH: The driver can disable the5696 * @NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH: The driver can disable the
5679 * forwarding of preauth frames over the control port. They are then5697 * forwarding of preauth frames over the control port. They are then
@@ -5684,6 +5702,9 @@ enum nl80211_feature_flags { · 4 unmodified lines
5684 * @NL80211_EXT_FEATURE_DEL_IBSS_STA: The driver supports removing stations5702 * @NL80211_EXT_FEATURE_DEL_IBSS_STA: The driver supports removing stations
5685 * in IBSS mode, essentially by dropping their state.5703 * in IBSS mode, essentially by dropping their state.
5686 *5704 *
5705 * @NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS: management frame registrations
5706 * are possible for multicast frames and those will be reported properly.
5707 *
5687 * @NUM_NL80211_EXT_FEATURES: number of extended features.5708 * @NUM_NL80211_EXT_FEATURES: number of extended features.
5688 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.5709 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
5689 */5710 */
@@ -5735,6 +5756,8 @@ enum nl80211_ext_feature_index { · 45 unmodified lines
5735 NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH,5756 NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH,
5736 NL80211_EXT_FEATURE_PROTECTED_TWT,5757 NL80211_EXT_FEATURE_PROTECTED_TWT,
5737 NL80211_EXT_FEATURE_DEL_IBSS_STA,5758 NL80211_EXT_FEATURE_DEL_IBSS_STA,
5759 NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS,
5760 NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT,
5738 5761
5739 /* add new features before the definition below */5762 /* add new features before the definition below */
5740 NUM_NL80211_EXT_FEATURES,5763 NUM_NL80211_EXT_FEATURES,