From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 17 Nov 2015 16:01:32 +0000 (+0100)
Subject: Merge pull request #1920 from teg/networkd-fixes
X-Git-Tag: v228~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92939fc4c0261dccd4b755186aba84a9b1412bed;p=thirdparty%2Fsystemd.git

Merge pull request #1920 from teg/networkd-fixes

networkd fixes
---

92939fc4c0261dccd4b755186aba84a9b1412bed
diff --cc src/network/networkd-ndisc.c
index 2ff87c32eb0,a2efac78f15..ce9e513ceb2
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@@ -205,12 -205,8 +205,12 @@@ static void ndisc_handler(sd_ndisc *nd
                  dhcp6_request_address(link);
  
                  r = sd_dhcp6_client_start(link->dhcp6_client);
-                 if (r < 0 && r != -EALREADY)
+                 if (r < 0 && r != -EBUSY)
                          log_link_warning_errno(link, r, "Starting DHCPv6 client after NDisc timeout failed: %m");
 +
 +                link->ndisc_configured = true;
 +                link_check_ready(link);
 +
                  break;
          case SD_NDISC_EVENT_STOP:
                  break;