Nick Hainke
acf9796d7d
Patches automatically refreshed. Link: https://github.com/openwrt/openwrt/pull/22745 Signed-off-by: Nick Hainke <vincent@systemli.org>
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 3 Jul 2025 11:22:26 +0200
|
|
Subject: [PATCH] hostapd: add support for specifying the link id in the config
|
|
|
|
Makes it easier to dynamically manage links for a MLD at run time.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/hostapd/config_file.c
|
|
+++ b/hostapd/config_file.c
|
|
@@ -4959,6 +4959,8 @@ static int hostapd_config_fill(struct ho
|
|
conf->punct_acs_threshold = val;
|
|
} else if (os_strcmp(buf, "mld_ap") == 0) {
|
|
bss->mld_ap = !!atoi(pos);
|
|
+ } else if (os_strcmp(buf, "mld_link_id") == 0) {
|
|
+ bss->mld_link_id = atoi(pos);
|
|
} else if (os_strcmp(buf, "mld_addr") == 0) {
|
|
if (hwaddr_aton(pos, bss->mld_addr)) {
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid mld_addr",
|
|
--- a/src/ap/ap_config.c
|
|
+++ b/src/ap/ap_config.c
|
|
@@ -179,6 +179,9 @@ void hostapd_config_defaults_bss(struct
|
|
#endif /* CONFIG_PASN */
|
|
bss->urnm_mfpr_x20 = -1;
|
|
bss->urnm_mfpr = -1;
|
|
+#ifdef CONFIG_IEEE80211BE
|
|
+ bss->mld_link_id = -1;
|
|
+#endif
|
|
#ifdef CONFIG_ENC_ASSOC
|
|
bss->assoc_frame_encryption = 0;
|
|
bss->pmksa_caching_privacy = 0;
|
|
--- a/src/ap/ap_config.h
|
|
+++ b/src/ap/ap_config.h
|
|
@@ -979,6 +979,8 @@ struct hostapd_bss_config {
|
|
/* The AP's MLD MAC address within the AP MLD */
|
|
u8 mld_addr[ETH_ALEN];
|
|
|
|
+ s8 mld_link_id;
|
|
+
|
|
#ifdef CONFIG_TESTING_OPTIONS
|
|
/*
|
|
* If set indicate the AP as disabled in the RNR element included in the
|
|
--- a/src/ap/hostapd.c
|
|
+++ b/src/ap/hostapd.c
|
|
@@ -3119,7 +3119,10 @@ struct hostapd_iface * hostapd_alloc_ifa
|
|
#ifdef CONFIG_IEEE80211BE
|
|
static void hostapd_bss_alloc_link_id(struct hostapd_data *hapd)
|
|
{
|
|
- hapd->mld_link_id = hapd->mld->next_link_id++;
|
|
+ if (hapd->conf->mld_link_id >= 0)
|
|
+ hapd->mld_link_id = hapd->conf->mld_link_id;
|
|
+ else
|
|
+ hapd->mld_link_id = hapd->mld->next_link_id++;
|
|
wpa_printf(MSG_DEBUG, "AP MLD: %s: Link ID %d assigned.",
|
|
hapd->mld->name, hapd->mld_link_id);
|
|
}
|