proto-shell: fix a regression with handling multiple proto updates for the same interface

Preserve the device when keep == true

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/proto-shell.c b/proto-shell.c
index 45717bf1f9716d174d2ebd6cc85f208688cb06fc..c4039ed6a486169f86931d8d075d9e037b2be566 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -445,28 +445,29 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
                        dev_create = 2;
        }
 
-       if (iface->state != IFS_UP)
+       if (iface->state != IFS_UP || !iface->l3_dev.dev)
                keep = false;
 
-       dev = iface->main_dev.dev;
-       if (tb[NOTIFY_IFNAME] && !keep) {
-               keep = false;
-               devname = blobmsg_data(tb[NOTIFY_IFNAME]);
-               if (tb[NOTIFY_TUNNEL])
-                       dev = proto_shell_create_tunnel(devname, tb[NOTIFY_TUNNEL]);
-               else
-                       dev = device_get(devname, dev_create);
-       }
+       if (!keep) {
+               dev = iface->main_dev.dev;
+               if (tb[NOTIFY_IFNAME]) {
+                       keep = false;
+                       devname = blobmsg_data(tb[NOTIFY_IFNAME]);
+                       if (tb[NOTIFY_TUNNEL])
+                               dev = proto_shell_create_tunnel(devname, tb[NOTIFY_TUNNEL]);
+                       else
+                               dev = device_get(devname, dev_create);
+               }
 
-       if (!dev)
-               return UBUS_STATUS_INVALID_ARGUMENT;
+               if (!dev)
+                       return UBUS_STATUS_INVALID_ARGUMENT;
 
-       interface_set_l3_dev(iface, dev);
-       device_claim(&iface->l3_dev);
-       device_set_present(dev, true);
+               interface_set_l3_dev(iface, dev);
+               device_claim(&iface->l3_dev);
+               device_set_present(dev, true);
 
-       if (!keep)
                interface_update_start(iface);
+       }
 
        proto_apply_ip_settings(iface, data, addr_ext);