diff options
author | Yousong Zhou <yszhou4tech@gmail.com> | 2015-08-21 10:11:56 +0800 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2015-08-25 08:26:56 +0200 |
commit | 11c7cf99c362b9dc33c6d1aa209321e38d131128 (patch) | |
tree | 707dc027310f73bced846cecfb1b9bc1fcc94df0 | |
parent | 5f0e4070402ff056584eac5afed490cd0a407697 (diff) |
Changes for more readability.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
-rw-r--r-- | device.h | 3 | ||||
-rw-r--r-- | interface.c | 4 | ||||
-rw-r--r-- | interface.h | 1 | ||||
-rw-r--r-- | ubus.c | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -160,8 +160,11 @@ struct device { struct blob_attr *config; bool config_pending; bool sys_present; + /* DEV_EVENT_ADD */ bool present; + /* DEV_EVENT_UP */ int active; + /* DEV_EVENT_LINK_UP */ bool link_active; bool external; diff --git a/interface.c b/interface.c index 848990e..ffe7988 100644 --- a/interface.c +++ b/interface.c @@ -649,7 +649,7 @@ interface_handle_config_change(struct interface *iface) } static void -interface_proto_cb(struct interface_proto_state *state, enum interface_proto_event ev) +interface_proto_event_cb(struct interface_proto_state *state, enum interface_proto_event ev) { struct interface *iface = state->iface; @@ -708,7 +708,7 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s if (!state) return; - state->proto_event = interface_proto_cb; + state->proto_event = interface_proto_event_cb; state->iface = iface; } diff --git a/interface.h b/interface.h index 8eeb7db..6f9112c 100644 --- a/interface.h +++ b/interface.h @@ -120,6 +120,7 @@ struct interface { struct list_head users; + /* for alias interface */ const char *parent_ifname; struct interface_user parent_iface; @@ -817,7 +817,7 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj, cur = tb[DEV_LINK_EXT]; if (cur) - link_ext = !!blobmsg_get_u8(cur); + link_ext = blobmsg_get_bool(cur); return interface_handle_link(iface, blobmsg_data(tb[DEV_LINK_NAME]), add, link_ext); } |