From: Chenming Huang <quic_chenhuan@quicinc.com>
Date: Wed, 17 Apr 2024 01:23:30 +0000 (+0530)
Subject: AP MLD: Set link_id field in hostapd_freq_params when setting up AP
X-Git-Tag: hostap_2_11~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11dfdf64c00bc7d85b0f7ce8cec0055d3341ce80;p=thirdparty%2Fhostap.git

AP MLD: Set link_id field in hostapd_freq_params when setting up AP

If not set, 0 is set by default and this could fail in the following
code path when link ID is not matching:
hostapd_drv_set_ap -> wpa_driver_nl80211_set_ap -> nl80211_set_channel

Signed-off-by: Chenming Huang <quic_chenhuan@quicinc.com>
---

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 8c2e491cb..ce806edf1 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -2626,8 +2626,14 @@ static int __ieee802_11_set_beacon(struct hostapd_data *hapd)
 				    cmode->vht_capab,
 				    &cmode->he_capab[IEEE80211_MODE_AP],
 				    &cmode->eht_capab[IEEE80211_MODE_AP],
-				    hostapd_get_punct_bitmap(hapd)) == 0)
+				    hostapd_get_punct_bitmap(hapd)) == 0) {
+		freq.link_id = -1;
+#ifdef CONFIG_IEEE80211BE
+		if (hapd->conf->mld_ap)
+			freq.link_id = hapd->mld_link_id;
+#endif /* CONFIG_IEEE80211BE */
 		params.freq = &freq;
+	}
 
 	for (i = 0; i < hapd->iface->num_hw_features; i++) {
 		mode = &hapd->iface->hw_features[i];