]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #1920 from teg/networkd-fixes
authorMartin Pitt <martin.pitt@ubuntu.com>
Tue, 17 Nov 2015 16:01:32 +0000 (17:01 +0100)
committerMartin Pitt <martin.pitt@ubuntu.com>
Tue, 17 Nov 2015 16:01:32 +0000 (17:01 +0100)
networkd fixes

1  2 
src/network/networkd-ndisc.c

index 2ff87c32eb0ca1e065e0585f5c373f2830694585,a2efac78f15e5a4e1d239f350ffe73768e96ca48..ce9e513ceb23b418eabe4be79bf0976d86b27b13
@@@ -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;