developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 1 | From 1d21cddd0fc1c715ad0b3e9bd997124861cffa16 Mon Sep 17 00:00:00 2001 |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 2 | From: Michael Lee <michael-cy.lee@mediatek.com> |
| 3 | Date: Fri, 28 Apr 2023 10:22:58 +0800 |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 4 | Subject: [PATCH] hostapd: mtk: Avoid setting beacon after wpa_supplicant stop |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 5 | the AP |
| 6 | |
| 7 | Add a new variable 'stopped_by_supplicant' to indicate the AP |
| 8 | interface is currently stopped by co-locating STA interface. |
| 9 | After the STA interface finishes association with some other APs, it |
| 10 | will reload the co-locating AP interfaces and marks the |
| 11 | 'stopped_by_supplicant' as 0. |
| 12 | --- |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 13 | hostapd/ctrl_iface.c | 4 ++++ |
| 14 | src/ap/beacon.c | 5 ++++- |
| 15 | src/ap/bss_load.c | 10 +++++++--- |
| 16 | src/ap/ctrl_iface_ap.c | 4 +++- |
| 17 | src/ap/hostapd.c | 4 +++- |
| 18 | src/ap/hostapd.h | 1 + |
| 19 | 6 files changed, 22 insertions(+), 6 deletions(-) |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 20 | |
| 21 | diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 22 | index 7f91cb6..8c48d8f 100644 |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 23 | --- a/hostapd/ctrl_iface.c |
| 24 | +++ b/hostapd/ctrl_iface.c |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 25 | @@ -193,11 +193,15 @@ static int hostapd_ctrl_iface_update(struct hostapd_data *hapd, char *txt) |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 26 | { |
| 27 | struct hostapd_config * (*config_read_cb)(const char *config_fname); |
| 28 | struct hostapd_iface *iface = hapd->iface; |
| 29 | + size_t j; |
| 30 | |
| 31 | config_read_cb = iface->interfaces->config_read_cb; |
| 32 | iface->interfaces->config_read_cb = hostapd_ctrl_iface_config_read; |
| 33 | reload_opts = txt; |
| 34 | |
| 35 | + for (j = 0; j < iface->num_bss; j++) |
| 36 | + iface->bss[j]->stopped_by_supplicant = 0; |
| 37 | + |
| 38 | hostapd_reload_config(iface, 0); |
| 39 | |
| 40 | iface->interfaces->config_read_cb = config_read_cb; |
| 41 | diff --git a/src/ap/beacon.c b/src/ap/beacon.c |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 42 | index ad56046..c67d08b 100644 |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 43 | --- a/src/ap/beacon.c |
| 44 | +++ b/src/ap/beacon.c |
| 45 | @@ -2125,7 +2125,8 @@ int ieee802_11_set_beacon(struct hostapd_data *hapd) |
| 46 | continue; |
| 47 | |
| 48 | for (i = 0; i < colocated->num_bss; i++) { |
| 49 | - if (colocated->bss[i] && colocated->bss[i]->started) |
| 50 | + if (colocated->bss[i] && colocated->bss[i]->started && |
| 51 | + !colocated->bss[i]->stopped_by_supplicant) |
| 52 | __ieee802_11_set_beacon(colocated->bss[i]); |
| 53 | } |
| 54 | } |
| 55 | @@ -2141,6 +2142,7 @@ int ieee802_11_set_beacons(struct hostapd_iface *iface) |
| 56 | |
| 57 | for (i = 0; i < iface->num_bss; i++) { |
| 58 | if (iface->bss[i]->started && |
| 59 | + !iface->bss[i]->stopped_by_supplicant && |
| 60 | ieee802_11_set_beacon(iface->bss[i]) < 0) |
| 61 | ret = -1; |
| 62 | } |
| 63 | @@ -2157,6 +2159,7 @@ int ieee802_11_update_beacons(struct hostapd_iface *iface) |
| 64 | |
| 65 | for (i = 0; i < iface->num_bss; i++) { |
| 66 | if (iface->bss[i]->beacon_set_done && iface->bss[i]->started && |
| 67 | + !iface->bss[i]->stopped_by_supplicant && |
| 68 | ieee802_11_set_beacon(iface->bss[i]) < 0) |
| 69 | ret = -1; |
| 70 | } |
| 71 | diff --git a/src/ap/bss_load.c b/src/ap/bss_load.c |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 72 | index 725d3cd..f2a1a10 100644 |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 73 | --- a/src/ap/bss_load.c |
| 74 | +++ b/src/ap/bss_load.c |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 75 | @@ -49,6 +49,9 @@ static void update_channel_utilization(void *eloop_data, void *user_data) |
| 76 | if (!(hapd->beacon_set_done && hapd->started)) |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 77 | return; |
| 78 | |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 79 | + if(hapd->stopped_by_supplicant) |
| 80 | + goto skip_update; |
| 81 | + |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 82 | err = hostapd_drv_get_survey(hapd, hapd->iface->freq); |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 83 | if (err) { |
| 84 | wpa_printf(MSG_ERROR, "BSS Load: Failed to get survey data"); |
| 85 | @@ -57,9 +60,6 @@ static void update_channel_utilization(void *eloop_data, void *user_data) |
| 86 | |
| 87 | ieee802_11_set_beacon(hapd); |
| 88 | |
| 89 | - if (get_bss_load_update_timeout(hapd, &sec, &usec) < 0) |
| 90 | - return; |
| 91 | - |
| 92 | if (hapd->conf->chan_util_avg_period) { |
| 93 | iface->chan_util_samples_sum += iface->channel_utilization; |
| 94 | iface->chan_util_num_sample_periods += |
| 95 | @@ -75,6 +75,10 @@ static void update_channel_utilization(void *eloop_data, void *user_data) |
| 96 | } |
| 97 | } |
| 98 | |
| 99 | +skip_update: |
| 100 | + if (get_bss_load_update_timeout(hapd, &sec, &usec) < 0) |
| 101 | + return; |
| 102 | + |
| 103 | eloop_register_timeout(sec, usec, update_channel_utilization, hapd, |
| 104 | NULL); |
| 105 | } |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 106 | diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c |
| 107 | index 2fae590..1ad37c5 100644 |
| 108 | --- a/src/ap/ctrl_iface_ap.c |
| 109 | +++ b/src/ap/ctrl_iface_ap.c |
| 110 | @@ -951,8 +951,10 @@ int hostapd_ctrl_iface_stop_ap(struct hostapd_data *hapd) |
| 111 | struct hostapd_iface *iface = hapd->iface; |
| 112 | int i; |
| 113 | |
| 114 | - for (i = 0; i < iface->num_bss; i++) |
| 115 | + for (i = 0; i < iface->num_bss; i++){ |
| 116 | + iface->bss[i]->stopped_by_supplicant = 1; |
| 117 | hostapd_drv_stop_ap(iface->bss[i]); |
| 118 | + } |
| 119 | |
| 120 | return 0; |
| 121 | } |
| 122 | diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 123 | index ef0d6db..b372977 100644 |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 124 | --- a/src/ap/hostapd.c |
| 125 | +++ b/src/ap/hostapd.c |
| 126 | @@ -477,6 +477,7 @@ void hostapd_free_hapd_data(struct hostapd_data *hapd) |
| 127 | } |
| 128 | hapd->started = 0; |
| 129 | hapd->beacon_set_done = 0; |
| 130 | + hapd->stopped_by_supplicant = 0; |
| 131 | |
| 132 | wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface); |
| 133 | hostapd_ubus_free_bss(hapd); |
| 134 | @@ -1257,6 +1258,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first, |
| 135 | return -1; |
| 136 | } |
| 137 | hapd->started = 1; |
| 138 | + hapd->stopped_by_supplicant = 0; |
| 139 | |
| 140 | if (!first || first == -1) { |
| 141 | u8 *addr = hapd->own_addr; |
developer | 636e523 | 2023-07-17 10:26:43 +0800 | [diff] [blame^] | 142 | @@ -4015,7 +4017,7 @@ void hostapd_switch_color(struct hostapd_data *hapd, u64 bitmap) |
| 143 | { |
| 144 | struct os_reltime now; |
| 145 | |
| 146 | - if (hapd->cca_in_progress) |
| 147 | + if (hapd->cca_in_progress || hapd->stopped_by_supplicant) |
| 148 | return; |
| 149 | |
| 150 | if (os_get_reltime(&now)) |
developer | 03283c0 | 2023-04-28 10:49:18 +0800 | [diff] [blame] | 151 | diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h |
| 152 | index 093c28a..3b51050 100644 |
| 153 | --- a/src/ap/hostapd.h |
| 154 | +++ b/src/ap/hostapd.h |
| 155 | @@ -190,6 +190,7 @@ struct hostapd_data { |
| 156 | unsigned int started:1; |
| 157 | unsigned int disabled:1; |
| 158 | unsigned int reenable_beacon:1; |
| 159 | + unsigned int stopped_by_supplicant:1; |
| 160 | |
| 161 | u8 own_addr[ETH_ALEN]; |
| 162 | |
| 163 | -- |
| 164 | 2.25.1 |
| 165 | |