Secure mesh had the implicit requirement that the Mesh Peering Management entity be in userspace. However userspace might want to implement an open MPM as well, so specify a mesh setup parameter to indicate this.
Showing the changes to include/uapi/linux (1 of 4 files). Show all
Unified · Split
| @@ -513,9 +513,11 @@ · 512 unmodified lines | ||
| 513 | 513 | * @NL80211_CMD_NEW_PEER_CANDIDATE: Notification on the reception of a |
| 514 | 514 | * beacon or probe response from a compatible mesh peer. This is only |
| 515 | 515 | * sent while no station information (sta_info) exists for the new peer |
| 516 | − * candidate and when @NL80211_MESH_SETUP_USERSPACE_AUTH is set. On | |
| 517 | − * reception of this notification, userspace may decide to create a new | |
| 518 | − * station (@NL80211_CMD_NEW_STATION). To stop this notification from | |
| 516 | + * candidate and when @NL80211_MESH_SETUP_USERSPACE_AUTH, | |
| 517 | + * @NL80211_MESH_SETUP_USERSPACE_AMPE, or | |
| 518 | + * @NL80211_MESH_SETUP_USERSPACE_MPM is set. On reception of this | |
| 519 | + * notification, userspace may decide to create a new station | |
| 520 | + * (@NL80211_CMD_NEW_STATION). To stop this notification from | |
| 519 | 521 | * reoccurring, the userspace authentication daemon may want to create the |
| 520 | 522 | * new station with the AUTHENTICATED flag unset and maybe change it later |
| 521 | 523 | * depending on the authentication result. |
| @@ -1199,10 +1201,10 @@ enum nl80211_commands { · 677 unmodified lines | ||
| 1199 | 1201 | * @NL80211_ATTR_SUPPORT_MESH_AUTH: Currently, this means the underlying driver |
| 1200 | 1202 | * allows auth frames in a mesh to be passed to userspace for processing via |
| 1201 | 1203 | * the @NL80211_MESH_SETUP_USERSPACE_AUTH flag. |
| 1202 | − * @NL80211_ATTR_STA_PLINK_STATE: The state of a mesh peer link as | |
| 1203 | − * defined in &enum nl80211_plink_state. Used when userspace is | |
| 1204 | − * driving the peer link management state machine. | |
| 1205 | − * @NL80211_MESH_SETUP_USERSPACE_AMPE must be enabled. | |
| 1204 | + * @NL80211_ATTR_STA_PLINK_STATE: The state of a mesh peer link as defined in | |
| 1205 | + * &enum nl80211_plink_state. Used when userspace is driving the peer link | |
| 1206 | + * management state machine. @NL80211_MESH_SETUP_USERSPACE_AMPE or | |
| 1207 | + * @NL80211_MESH_SETUP_USERSPACE_MPM must be enabled. | |
| 1206 | 1208 | * |
| 1207 | 1209 | * @NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED: indicates, as part of the wiphy |
| 1208 | 1210 | * capabilities, the supported WoWLAN triggers |
| @@ -2612,6 +2614,9 @@ enum nl80211_meshconf_params { · 1403 unmodified lines | ||
| 2612 | 2614 | * vendor specific synchronization method or disable it to use the default |
| 2613 | 2615 | * neighbor offset synchronization |
| 2614 | 2616 | * |
| 2617 | + * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will | |
| 2618 | + * implement an MPM which handles peer allocation and state. | |
| 2619 | + * | |
| 2615 | 2620 | * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number |
| 2616 | 2621 | * |
| 2617 | 2622 | * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use |
| @@ -2624,6 +2629,7 @@ enum nl80211_mesh_setup_params { · 6 unmodified lines | ||
| 2624 | 2629 | NL80211_MESH_SETUP_USERSPACE_AUTH, |
| 2625 | 2630 | NL80211_MESH_SETUP_USERSPACE_AMPE, |
| 2626 | 2631 | NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC, |
| 2632 | + NL80211_MESH_SETUP_USERSPACE_MPM, | |
| 2627 | 2633 | |
| 2628 | 2634 | /* keep last */ |
| 2629 | 2635 | __NL80211_MESH_SETUP_ATTR_AFTER_LAST, |
| @@ -3526,6 +3532,10 @@ enum nl80211_ap_sme_features { · 896 unmodified lines | ||
| 3526 | 3532 | * stations the authenticated/associated bits have to be set in the mask. |
| 3527 | 3533 | * @NL80211_FEATURE_ADVERTISE_CHAN_LIMITS: cfg80211 advertises channel limits |
| 3528 | 3534 | * (HT40, VHT 80/160 MHz) if this flag is set |
| 3535 | + * @NL80211_FEATURE_USERSPACE_MPM: This driver supports a userspace Mesh | |
| 3536 | + * Peering Management entity which may be implemented by registering for | |
| 3537 | + * beacons or NL80211_CMD_NEW_PEER_CANDIDATE events. The mesh beacon is | |
| 3538 | + * still generated by the driver. | |
| 3529 | 3539 | */ |
| 3530 | 3540 | enum nl80211_feature_flags { |
| 3531 | 3541 | NL80211_FEATURE_SK_TX_STATUS = 1 << 0, |
| @@ -3544,6 +3554,7 @@ enum nl80211_feature_flags { · 12 unmodified lines | ||
| 3544 | 3554 | /* bit 13 is reserved */ |
| 3545 | 3555 | NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14, |
| 3546 | 3556 | NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15, |
| 3557 | + NL80211_FEATURE_USERSPACE_MPM = 1 << 16, | |
| 3547 | 3558 | }; |
| 3548 | 3559 | |
| 3549 | 3560 | /** |