From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 10 Apr 2021 04:37:35 +0000 (+0900)
Subject: network: refuse to configure NDISC twice
X-Git-Tag: v249-rc1~437
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c078687dca3d86cf4633e39b7e7bc1a4f761d42;p=thirdparty%2Fsystemd.git

network: refuse to configure NDISC twice
---

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index ba7c184b662..6830cf592e2 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -1315,15 +1315,16 @@ int ndisc_configure(Link *link) {
         if (!link_ipv6_accept_ra_enabled(link))
                 return 0;
 
-        if (!link->ndisc) {
-                r = sd_ndisc_new(&link->ndisc);
-                if (r < 0)
-                        return r;
+        if (link->ndisc)
+                return 0; /* Already configured. */
 
-                r = sd_ndisc_attach_event(link->ndisc, link->manager->event, 0);
-                if (r < 0)
-                        return r;
-        }
+        r = sd_ndisc_new(&link->ndisc);
+        if (r < 0)
+                return r;
+
+        r = sd_ndisc_attach_event(link->ndisc, link->manager->event, 0);
+        if (r < 0)
+                return r;
 
         r = sd_ndisc_set_mac(link->ndisc, &link->hw_addr.addr.ether);
         if (r < 0)