Treat IPv4LL as fallback and start DHCP discovery even if the prior lease

was IPv4LL when rebooting.

diff --git a/dhcp.c b/dhcp.c
index e0498647eb774e9e43fd141536091cbb57f9c467..81ca1d84d169f1e94c23c835b7570ed005bec77b 100644 (file)
--- a/dhcp.c
+++ b/dhcp.c
@@ -3042,10 +3042,8 @@ dhcp_start1(void *arg)
                return;
        }
 
-       if (state->offer == NULL)
+       if (state->offer == NULL || state->offer->cookie == 0)
                dhcp_discover(ifp);
-       else if (state->offer->cookie == 0 && ifo->options & DHCPCD_IPV4LL)
-               ipv4ll_start(ifp);
        else
                dhcp_reboot(ifp);
 }