developer | 05f3b2b | 2024-08-19 19:17:34 +0800 | [diff] [blame] | 1 | From e9192ac36cdeb2a3d2bfd979161c0016c19e1a5c Mon Sep 17 00:00:00 2001 |
developer | 66e89bc | 2024-04-23 14:50:01 +0800 | [diff] [blame] | 2 | From: Bo Jiao <Bo.Jiao@mediatek.com> |
| 3 | Date: Thu, 19 Oct 2023 14:08:50 +0800 |
developer | 05f3b2b | 2024-08-19 19:17:34 +0800 | [diff] [blame] | 4 | Subject: [PATCH 075/126] mtk: hostapd: fix issue that tx status handle with |
developer | 66e89bc | 2024-04-23 14:50:01 +0800 | [diff] [blame] | 5 | unmatch hostapd_data. |
| 6 | |
| 7 | Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com> |
| 8 | --- |
| 9 | src/ap/ieee802_11.c | 11 ++++++++++- |
| 10 | src/drivers/driver_nl80211_event.c | 2 +- |
| 11 | 2 files changed, 11 insertions(+), 2 deletions(-) |
| 12 | |
| 13 | diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c |
developer | 05f3b2b | 2024-08-19 19:17:34 +0800 | [diff] [blame] | 14 | index d26b50031..fbe3f582f 100644 |
developer | 66e89bc | 2024-04-23 14:50:01 +0800 | [diff] [blame] | 15 | --- a/src/ap/ieee802_11.c |
| 16 | +++ b/src/ap/ieee802_11.c |
developer | 05f3b2b | 2024-08-19 19:17:34 +0800 | [diff] [blame] | 17 | @@ -6614,11 +6614,20 @@ static void handle_assoc_cb(struct hostapd_data *hapd, |
developer | 66e89bc | 2024-04-23 14:50:01 +0800 | [diff] [blame] | 18 | #ifdef CONFIG_IEEE80211BE |
| 19 | if (ap_sta_is_mld(hapd, sta) && |
| 20 | hapd->mld_link_id != sta->mld_assoc_link_id) { |
| 21 | + struct hostapd_data *temp_hapd = hapd; |
| 22 | + |
| 23 | /* See ieee80211_ml_link_sta_assoc_cb() for the MLD case */ |
| 24 | wpa_printf(MSG_DEBUG, |
| 25 | "%s: MLD: ignore on link station (%d != %d)", |
| 26 | __func__, hapd->mld_link_id, sta->mld_assoc_link_id); |
| 27 | - return; |
| 28 | + |
| 29 | + if (temp_hapd->conf->mld_ap && sta->mld_assoc_link_id >= 0) { |
| 30 | + struct hostapd_data *link_bss; |
| 31 | + |
| 32 | + link_bss = hostapd_mld_get_link_bss(temp_hapd, sta->mld_assoc_link_id); |
| 33 | + if (link_bss) |
| 34 | + hapd = link_bss; |
| 35 | + } |
| 36 | } |
| 37 | #endif /* CONFIG_IEEE80211BE */ |
| 38 | |
| 39 | diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c |
developer | 05f3b2b | 2024-08-19 19:17:34 +0800 | [diff] [blame] | 40 | index 07af6be77..635401564 100644 |
developer | 66e89bc | 2024-04-23 14:50:01 +0800 | [diff] [blame] | 41 | --- a/src/drivers/driver_nl80211_event.c |
| 42 | +++ b/src/drivers/driver_nl80211_event.c |
developer | 05f3b2b | 2024-08-19 19:17:34 +0800 | [diff] [blame] | 43 | @@ -1381,7 +1381,7 @@ static void mlme_event_mgmt(struct i802_bss *bss, |
developer | 66e89bc | 2024-04-23 14:50:01 +0800 | [diff] [blame] | 44 | event.rx_mgmt.ctx = bss->ctx; |
| 45 | event.rx_mgmt.link_id = link_id; |
| 46 | |
| 47 | - wpa_supplicant_event(drv->ctx, EVENT_RX_MGMT, &event); |
| 48 | + wpa_supplicant_event(bss->ctx, EVENT_RX_MGMT, &event); |
| 49 | } |
| 50 | |
| 51 | |
| 52 | -- |
developer | 05f3b2b | 2024-08-19 19:17:34 +0800 | [diff] [blame] | 53 | 2.18.0 |
developer | 66e89bc | 2024-04-23 14:50:01 +0800 | [diff] [blame] | 54 | |