hostapd: fix patch rebase after a crash fix
authorFelix Fietkau <nbd@nbd.name>
Fri, 22 Sep 2023 17:59:09 +0000 (19:59 +0200)
committerFelix Fietkau <nbd@nbd.name>
Fri, 22 Sep 2023 18:01:43 +0000 (20:01 +0200)
The patch refresh accidentally moved the hostapd_ucode_free_iface call to
the wrong function

Fixes: e9722aef9e84 ("hostapd: fix a crash when disabling an interface during channel list update")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 3a5ad6e3d74da713c0fc7d63b8026a56d16e198b)

package/network/services/hostapd/patches/601-ucode_support.patch

index 285309c0caab238951629ba37351d219b898f220..de182b985d97b33b4346bc6e8fcb140bc424dfc4 100644 (file)
        hostapd_ubus_free_bss(hapd);
        accounting_deinit(hapd);
        hostapd_deinit_wpa(hapd);
-@@ -570,6 +573,7 @@ static void sta_track_deinit(struct host
void hostapd_cleanup_iface_partial(struct hostapd_iface *iface)
+@@ -600,6 +603,7 @@ void hostapd_cleanup_iface_partial(struc
static void hostapd_cleanup_iface(struct hostapd_iface *iface)
  {
        wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
 +      hostapd_ucode_free_iface(iface);
-       eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
- #ifdef NEED_AP_MLME
-       hostapd_stop_setup_timers(iface);
+       eloop_cancel_timeout(hostapd_interface_setup_failure_handler, iface,
+                            NULL);
 @@ -1189,6 +1193,7 @@ static int hostapd_start_beacon(struct h
                hapd->driver->set_operstate(hapd->drv_priv, 1);