mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-02-18 02:25:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

wifi-scripts: fix spurious teardown on config_change during setup
Some checks failed
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Details

Browse source 
When config_change is set during an active setup (e.g. by a concurrent
reconf call), wdev_mark_up() attempted to call setup() while still in
"setup" state. Since setup() requires state "up" or "down", it silently
returned, leaving the state as "setup". The subsequent wdev_setup_cb()
then treated this as a setup failure, triggering an unnecessary
teardown+restart cycle.

Fix this by removing the config_change handling from wdev_mark_up() and
moving it to wdev_setup_cb() instead. wdev_mark_up() now always
transitions to "up" state. When wdev_setup_cb() runs afterwards and
finds the device already "up" with config_change set, it initiates a
clean re-setup from the "up" state where setup() can run.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 3553eda283)
This commit is contained in:
Felix Fietkau 2026-02-08 18:46:07 +00:00
parent 85342bea07
commit 910eb0cc4e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package/network/config/wifi-scripts/files/lib/netifd/wireless-device.uc
View file

@ -142,8 +142,13 @@ function wdev_config_init(wdev)
function wdev_setup_cb(wdev)
{
if (wdev.state != "setup")
if (wdev.state != "setup") {
if (wdev.state == "up" && wdev.config_change) {
wdev_config_init(wdev);
wdev.setup();
}
return;
}
if (wdev.retry > 0)
wdev.retry--;
@ -448,11 +453,6 @@ function wdev_mark_up(wdev)
if (wdev.state != "setup")
return;
if (wdev.config_change) {
wdev.setup();
return;
}
for (let section, data in wdev.handler_data) {
if (data.ifname)
handle_link(data.ifname, data, true);