X-Git-Url: http://git.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=acfe8b156457d60c1c788899d5a728e4ef9bdd06;hp=4b22807f4a4a1c0b6e568bfd00395292544b3b3f;hb=f505119b07b89ad23f4264e77b0bf0f0c0400399;hpb=a323f3adf275954727f32895eea37bfcf0aa9fb7 diff --git a/interface.c b/interface.c index 4b22807..acfe8b1 100644 --- a/interface.c +++ b/interface.c @@ -86,7 +86,8 @@ mark_interface_down(struct interface *iface) { vlist_flush_all(&iface->proto_addr); vlist_flush_all(&iface->proto_route); - device_release(&iface->main_dev); + if (iface->main_dev.dev) + device_release(&iface->main_dev); iface->state = IFS_DOWN; } @@ -98,9 +99,11 @@ __interface_set_up(struct interface *iface) if (iface->state != IFS_DOWN) return 0; - ret = device_claim(&iface->main_dev); - if (ret) - return ret; + if (iface->main_dev.dev) { + ret = device_claim(&iface->main_dev); + if (ret) + return ret; + } iface->state = IFS_SETUP; ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false); @@ -145,6 +148,12 @@ interface_cb(struct device_user *dep, enum device_event ev) return; } + interface_set_available(iface, new_state); +} + +void +interface_set_available(struct interface *iface, bool new_state) +{ if (iface->available == new_state) return; @@ -225,7 +234,8 @@ interface_alloc(const char *name, struct blob_attr *attr) proto_attach_interface(iface, proto_name); - if ((cur = tb[IFACE_ATTR_IFNAME])) { + if (!(iface->proto_handler->flags & PROTO_FLAG_NODEV) && + (cur = tb[IFACE_ATTR_IFNAME])) { dev = device_get(blobmsg_data(cur), true); if (dev) device_add_user(&iface->main_dev, dev);