projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proto-shell: ensure that l3_dev is always set
[project/netifd.git]
/
proto-shell.c
diff --git
a/proto-shell.c
b/proto-shell.c
index
de1b084
..
45717bf
100644
(file)
--- a/
proto-shell.c
+++ b/
proto-shell.c
@@
-445,28
+445,26
@@
proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
dev_create = 2;
}
dev_create = 2;
}
- if (!tb[NOTIFY_IFNAME]) {
- if (!iface->main_dev.dev)
- return UBUS_STATUS_INVALID_ARGUMENT;
- } else if (!keep || iface->state != IFS_UP) {
+ if (iface->state != IFS_UP)
+ keep = false;
+
+ dev = iface->main_dev.dev;
+ if (tb[NOTIFY_IFNAME] && !keep) {
keep = false;
devname = blobmsg_data(tb[NOTIFY_IFNAME]);
keep = false;
devname = blobmsg_data(tb[NOTIFY_IFNAME]);
- if (tb[NOTIFY_TUNNEL]) {
- dev = proto_shell_create_tunnel(devname,
- tb[NOTIFY_TUNNEL]);
- if (!dev)
- return UBUS_STATUS_INVALID_ARGUMENT;
- } else {
+ if (tb[NOTIFY_TUNNEL])
+ dev = proto_shell_create_tunnel(devname, tb[NOTIFY_TUNNEL]);
+ else
dev = device_get(devname, dev_create);
dev = device_get(devname, dev_create);
- if (!dev)
- return UBUS_STATUS_NOT_FOUND;
- }
-
- interface_set_l3_dev(iface, dev);
- device_claim(&iface->l3_dev);
- device_set_present(dev, true);
}
}
+ if (!dev)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ interface_set_l3_dev(iface, dev);
+ device_claim(&iface->l3_dev);
+ device_set_present(dev, true);
+
if (!keep)
interface_update_start(iface);
if (!keep)
interface_update_start(iface);