make it possible to decouple interface availability from having a main device

diff --git a/interface.c b/interface.c
index 4b22807f4a4a1c0b6e568bfd00395292544b3b3f..8c1c006d49be95fddbf8632fd02981bca701ef12 100644 (file)
--- 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;
 

diff --git a/interface.h b/interface.h
index 020306c36c9c6d6705e94c5222a496d91df59d3a..72a00c98c41b7ff6de7bfc254076505946e4b04b 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -69,6 +69,7 @@ void interface_free(struct interface *iface);
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state);
 
+void interface_set_available(struct interface *iface, bool new_state);
 int interface_set_up(struct interface *iface);
 int interface_set_down(struct interface *iface);