wlan-ap-Telecominfraproject/feeds/qca/hostapd/patches/r02-020-hostapd-process-nl80211-stop-AP-events-on-link-basis.patch

From 2aeba574badedc8237e67579bec000c2ee41f97f Mon Sep 17 00:00:00 2001
From: Aditya Kumar Singh <quic_adisi@quicinc.com>
Date: Tue, 21 Nov 2023 10:56:18 +0530
Subject: [PATCH 1/2] hostapd: process nl80211 stop AP events on link basis

Currently, stop AP events are processed on the first BSS in drv
always. However, with multi-link operation, the event will have
link ID attribute which is not used and still it is passed to
first BSS which is wrong. It can be used to properly route
the event to intended BSS.

Also, there is a need to update bss->links[] state once a link
is removed so that later it can be added back.

Add support for the same.

Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
---
 src/drivers/driver_nl80211.c       |  3 +--
 src/drivers/driver_nl80211.h       |  1 +
 src/drivers/driver_nl80211_event.c | 33 ++++++++++++++++++++++++++----
 3 files changed, 31 insertions(+), 6 deletions(-)

--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -197,7 +197,6 @@ static int nl80211_put_mesh_config(struc
 static int i802_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr,
 			     u16 reason);
 
-static int nl80211_remove_link(struct i802_bss *bss, int link_id);
 static void nl80211_remove_links(struct i802_bss *bss);
 
 /* Converts nl80211_chan_width to a common format */
@@ -9500,7 +9499,7 @@ fail:
 	return -1;
 }
 
-static int nl80211_remove_link(struct i802_bss *bss, int link_id)
+int nl80211_remove_link(struct i802_bss *bss, int link_id)
 {
 	struct wpa_driver_nl80211_data *drv = bss->drv;
 	struct i802_link *link = NULL;
--- a/src/drivers/driver_nl80211.h
+++ b/src/drivers/driver_nl80211.h
@@ -372,5 +372,6 @@ int wpa_driver_set_phyname(struct wpa_dr
 struct hostapd_multi_hw_info *
 nl80211_get_multi_hw_info(void *priv, u8 *num_multi_hws);
 bool nl80211_link_valid(struct i802_bss *bss, s8 link_id);
+int nl80211_remove_link(struct i802_bss *bss, int link_id);
 
 #endif /* DRIVER_NL80211_H */
--- a/src/drivers/driver_nl80211_event.c
+++ b/src/drivers/driver_nl80211_event.c
@@ -2399,10 +2399,35 @@ static void nl80211_tdls_oper_event(stru
 }
 
 
-static void nl80211_stop_ap(struct wpa_driver_nl80211_data *drv,
-			    struct nlattr **tb)
+static void nl80211_stop_ap(struct i802_bss *bss, struct nlattr **tb)
 {
-	wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_UNAVAILABLE, NULL);
+	struct wpa_driver_nl80211_data *drv = bss->drv;
+	struct i802_link *mld_link = NULL;
+	void *ctx = bss->ctx;
+	int link_id = -1;
+
+	if (tb[NL80211_ATTR_MLO_LINK_ID]) {
+		link_id = nla_get_u8(tb[NL80211_ATTR_MLO_LINK_ID]);
+		mld_link = nl80211_get_link_or_null(bss, link_id);
+		if (!mld_link) {
+			wpa_printf(MSG_DEBUG,
+				   "nl80211: Ignoring STOP_AP event on invalid link id %d",
+				   link_id);
+			return;
+		}
+
+		wpa_printf(MSG_DEBUG,
+			   "nl80211: STOP_AP event on link %d", link_id);
+		ctx = mld_link->ctx;
+	}
+
+	/* driver would have already deleted the link hence ret would be non-zero.
+	 * Ignore that since nl80211_remove_link() is called only to update the
+	 * bss->links[] state
+	 */
+	nl80211_remove_link(bss, mld_link ? mld_link->link_id : bss->flink->link_id);
+
+	wpa_supplicant_event(ctx, EVENT_INTERFACE_UNAVAILABLE, NULL);
 }
 
 
@@ -4250,7 +4275,7 @@ static void do_process_drv_event(struct
 		nl80211_radar_event(bss, tb);
 		break;
 	case NL80211_CMD_STOP_AP:
-		nl80211_stop_ap(drv, tb);
+		nl80211_stop_ap(bss, tb);
 		break;
 	case NL80211_CMD_VENDOR:
 		nl80211_vendor_event(drv, tb);