]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd-link: link_configure(); factor out link_configure_can() into separate function
authorMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 30 May 2018 09:47:23 +0000 (11:47 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Sat, 9 Jun 2018 13:12:31 +0000 (15:12 +0200)
src/network/networkd-link.c

index c714cd4fc72bee09c1c8f1d977e64038a364e564..ed87ab8d622ce8a98a1aa6606bb67dfb8312bcd2 100644 (file)
@@ -2599,6 +2599,20 @@ static int link_update_lldp(Link *link) {
         return r;
 }
 
+static int link_configure_can(Link *link) {
+        int r;
+
+        if (!(link->flags & IFF_UP)) {
+                r = link_up_can(link);
+                if (r < 0) {
+                        link_enter_failed(link);
+                        return r;
+                }
+        }
+
+        return 0;
+}
+
 static int link_configure(Link *link) {
         int r;
 
@@ -2606,18 +2620,8 @@ static int link_configure(Link *link) {
         assert(link->network);
         assert(link->state == LINK_STATE_PENDING);
 
-        if (streq_ptr(link->kind, "vcan")) {
-
-                if (!(link->flags & IFF_UP)) {
-                        r = link_up_can(link);
-                        if (r < 0) {
-                                link_enter_failed(link);
-                                return r;
-                        }
-                }
-
-                return 0;
-        }
+        if (streq_ptr(link->kind, "vcan"))
+                return link_configure_can(link);
 
         /* Drop foreign config, but ignore loopback or critical devices.
          * We do not want to remove loopback address or addresses used for root NFS. */