[openwrt/openwrt] hostapd: fix patch rebase after a crash fix

LEDE Commits lede-commits at lists.infradead.org
Fri Sep 22 11:01:48 PDT 2023


nbd pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/2f30dec3cbe56eca9f310922b6b694b3d6d57c5d

commit 2f30dec3cbe56eca9f310922b6b694b3d6d57c5d
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri Sep 22 19:59:09 2023 +0200

    hostapd: fix patch rebase after a crash fix
    
    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 at nbd.name>
    (cherry picked from commit 3a5ad6e3d74da713c0fc7d63b8026a56d16e198b)
---
 .../network/services/hostapd/patches/601-ucode_support.patch   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/network/services/hostapd/patches/601-ucode_support.patch b/package/network/services/hostapd/patches/601-ucode_support.patch
index 285309c0ca..de182b985d 100644
--- a/package/network/services/hostapd/patches/601-ucode_support.patch
+++ b/package/network/services/hostapd/patches/601-ucode_support.patch
@@ -107,14 +107,14 @@
  	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);
  




More information about the lede-commits mailing list