X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Futils%2Fucode%2Fpatches%2F100-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch;fp=package%2Futils%2Fucode%2Fpatches%2F100-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch;h=0000000000000000000000000000000000000000;hb=51c70e459d0e5bd8e1c9df63b5fd3c0025e831d3;hp=a1659be3c89fd196e8b003df572ea5238e79eab0;hpb=4e53a3f47ed1312e87b032a839e98813d9605aad;p=openwrt%2Fopenwrt.git diff --git a/package/utils/ucode/patches/100-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch b/package/utils/ucode/patches/100-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch deleted file mode 100644 index a1659be3c8..0000000000 --- a/package/utils/ucode/patches/100-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Felix Fietkau -Date: Wed, 1 May 2024 18:40:19 +0200 -Subject: [PATCH] ubus: fix uc_ubus_have_uloop for eloop+uloop combination - -When uloop has been integrated with eloop (in hostapd/wpa_supplicant), -uloop_cancelling will return false, since uloop_run is not being called. -This leads to ubus.defer() calling uloop_run in a context where it can -prevent the other event loop from running. - -Fix this by detecting event loop integration via uloop_fd_set_cb being set - -Signed-off-by: Felix Fietkau ---- - ---- a/lib/ubus.c -+++ b/lib/ubus.c -@@ -665,6 +665,9 @@ uc_ubus_have_uloop(void) - bool prev = uloop_cancelled; - bool active; - -+ if (uloop_fd_set_cb) -+ return true; -+ - uloop_cancelled = true; - active = uloop_cancelling(); - uloop_cancelled = prev;