Revert "netifd: Link layer state support on interface level"

This reverts commit 7335c3e19ea09674245dda3653d3f40705e68d6b.

diff --git a/interface.c b/interface.c
index 4b381a431cbe3c0ae27e8afb15800cf903870b8d..9c208a283e40a2da7716651922aaa0b0a4e44b58 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -200,9 +200,6 @@ mark_interface_down(struct interface *iface)
 {
        enum interface_state state = iface->state;
 
-       if (state == IFS_DOWN)
-               return;
-
        iface->state = IFS_DOWN;
        if (state == IFS_UP)
                interface_event(iface, IFEV_DOWN);
@@ -215,112 +212,42 @@ mark_interface_down(struct interface *iface)
 void
 __interface_set_down(struct interface *iface, bool force)
 {
-       switch (iface->state) {
-       case IFS_UP:
-               interface_event(iface, IFEV_DOWN);
-       case IFS_SETUP:
-               iface->state = IFS_TEARDOWN;
-               interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
-               if (force)
-                       interface_flush_state(iface);
-
-               if (iface->dynamic)
-                       vlist_delete(&interfaces, &iface->node);
-               break;
-
-       case IFS_DOWN:
-               if (iface->main_dev.dev)
-                       device_release(&iface->main_dev);
-       case IFS_TEARDOWN:
-       default:
-               break;
-       }
-}
-
-static int
-__interface_set_up(struct interface *iface)
-{
-       int ret;
-
-       netifd_log_message(L_NOTICE, "Interface '%s' is setting up now\n", iface->name);
-
-       iface->state = IFS_SETUP;
-       ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
-       if (ret)
-               mark_interface_down(iface);
-
-       return ret;
-}
-
-static void
-interface_check_state(struct interface *iface)
-{
-       switch (iface->state) {
-       case IFS_UP:
-               if (!iface->enabled || !iface->link_state) {
-                       mark_interface_down(iface);
-                       interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
-               }
-               break;
-       case IFS_DOWN:
-               if (iface->enabled && iface->link_state && !config_init)
-                       __interface_set_up(iface);
-               break;
-       default:
-               break;
-       }
-}
-
-static void
-interface_set_enabled(struct interface *iface, bool new_state)
-{
-       if (iface->enabled == new_state)
+       if (iface->state == IFS_DOWN ||
+               iface->state == IFS_TEARDOWN)
                return;
 
-       netifd_log_message(L_NOTICE, "Interface '%s' is %s\n", iface->name, new_state ? "enabled" : "disabled");
-       iface->enabled = new_state;
-       interface_check_state(iface);
-}
-
-static void
-interface_set_link_state(struct interface *iface, bool new_state)
-{
-       if (iface->link_state == new_state)
-               return;
+       if (iface->state == IFS_UP)
+               interface_event(iface, IFEV_DOWN);
+       iface->state = IFS_TEARDOWN;
+       interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
+       if (force)
+               interface_flush_state(iface);
 
-       netifd_log_message(L_NOTICE, "Interface '%s' has link connectivity %s\n", iface->name, new_state ? "" : "loss");
-       iface->link_state = new_state;
-       interface_check_state(iface);
+       if (iface->dynamic)
+               vlist_delete(&interfaces, &iface->node);
 }
 
 static void
 interface_cb(struct device_user *dep, enum device_event ev)
 {
        struct interface *iface;
-       bool new_state = false;
+       bool new_state;
 
        iface = container_of(dep, struct interface, main_dev);
        switch (ev) {
        case DEV_EVENT_ADD:
                new_state = true;
-       case DEV_EVENT_REMOVE:
-               interface_set_available(iface, new_state);
-               if (!new_state && dep->dev->external)
-                       interface_set_main_dev(iface, NULL);
                break;
-       case DEV_EVENT_UP:
-               new_state = true;
-       case DEV_EVENT_DOWN:
-               interface_set_enabled(iface, new_state);
-               break;
-       case DEV_EVENT_LINK_UP:
-               new_state = true;
-        case DEV_EVENT_LINK_DOWN:
-               interface_set_link_state(iface, new_state);
+       case DEV_EVENT_REMOVE:
+               new_state = false;
                break;
        default:
-               break;
+               return;
        }
+
+       interface_set_available(iface, new_state);
+       if (!new_state && dep->dev->external)
+               interface_set_main_dev(iface, NULL);
 }
 
 void
@@ -757,7 +684,7 @@ interface_set_l3_dev(struct interface *iface, struct device *dev)
 void
 interface_set_main_dev(struct interface *iface, struct device *dev)
 {
-       bool set_l3 = (!dev || iface->main_dev.dev == iface->l3_dev.dev);
+       bool set_l3 = (iface->main_dev.dev == iface->l3_dev.dev);
        bool claimed = iface->l3_dev.claimed;
 
        if (iface->main_dev.dev == dev)
@@ -767,10 +694,8 @@ interface_set_main_dev(struct interface *iface, struct device *dev)
                interface_set_l3_dev(iface, dev);
 
        device_add_user(&iface->main_dev, dev);
-       if (!dev) {
-               interface_set_link_state(iface, false);
+       if (!dev)
                return;
-       }
 
        if (claimed)
                device_claim(&iface->l3_dev);
@@ -869,13 +794,18 @@ interface_set_up(struct interface *iface)
 
        if (iface->main_dev.dev) {
                ret = device_claim(&iface->main_dev);
-               if (!ret)
-                       interface_check_state(iface);
+               if (ret)
+                       return ret;
        }
-       else
-               ret = __interface_set_up(iface);
 
-       return ret;
+       iface->state = IFS_SETUP;
+       ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
+       if (ret) {
+               mark_interface_down(iface);
+               return ret;
+       }
+
+       return 0;
 }
 
 int

diff --git a/interface.h b/interface.h
index 1004bddc2e61e843f7efe409e880b932f02c4962..4b7de5997d3055e1e85938230d3017f0356fa433 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -95,8 +95,6 @@ struct interface {
        bool autostart;
        bool config_autostart;
        bool device_config;
-       bool enabled;
-       bool link_state;
        bool dynamic;
 
        time_t start_time;

diff --git a/proto-shell.c b/proto-shell.c
index 27fe2652912273b614c97c67ef71f19b69da303e..6bbfe10ea6696f13607c23ca731d36dd1b9b5dd6 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -158,7 +158,6 @@ proto_shell_handler(struct interface_proto_state *proto,
                action = "setup";
                state->last_error = -1;
                proto_shell_clear_host_dep(state);
-               state->sm = S_SETUP;
        } else {
                if (state->sm == S_TEARDOWN)
                        return 0;