networkd: netdev add one separate line

[elogind.git] / src / network / networkd-netdev.c

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index bf82047dc0415897035b2b130e3592a86a5236fb..13338aec512fcd173acfd913cde7c388e4d2f7f1 100644 (file)
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -221,6 +221,7 @@ static int netdev_enter_ready(NetDev *netdev) {
 
         return 0;
 }
+
 static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         NetDev *netdev = userdata;
         int r;
@@ -691,9 +692,10 @@ static int netdev_load_one(Manager *manager, const char *filename) {
 
         LIST_HEAD_INIT(netdev->callbacks);
 
-        if(netdev->kind == NETDEV_KIND_VETH) {
-                if (netdev->ifname_peer) {
-                        log_warning("Veth NetDev without Peer Name configured "
+        switch (netdev->kind) {
+        case NETDEV_KIND_VETH:
+                if (!netdev->ifname_peer) {
+                        log_warning("Veth NetDev without peer name configured "
                                     "in %s. Ignoring", filename);
                         return 0;
                 }
@@ -707,19 +709,19 @@ static int netdev_load_one(Manager *manager, const char *filename) {
                         }
                 }
 
-                return netdev_create_veth(netdev, netdev_create_handler);
-        }
+                r = netdev_create_veth(netdev, netdev_create_handler);
+                if (r < 0)
+                        return r;
 
-        if (netdev->kind != NETDEV_KIND_VLAN &&
-            netdev->kind != NETDEV_KIND_MACVLAN &&
-            netdev->kind != NETDEV_KIND_VXLAN &&
-            netdev->kind != NETDEV_KIND_IPIP &&
-            netdev->kind != NETDEV_KIND_GRE &&
-            netdev->kind != NETDEV_KIND_SIT &&
-            netdev->kind != NETDEV_KIND_VTI) {
+                break;
+        case NETDEV_KIND_BRIDGE:
+        case NETDEV_KIND_BOND:
                 r = netdev_create(netdev, NULL, NULL);
                 if (r < 0)
                         return r;
+                break;
+        default:
+                break;
         }
 
         log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind));