X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fdhcpv6.c;h=0d206f352d8d1d1ad04fb8066cd289bfb5603525;hp=6e5e8ba88ecec32c0fd2edaddb500c0dfe7495c6;hb=3dabd4b1c14df34f0a315c3e329d73ba27ac42b5;hpb=dbe066616e7fb2d1845066c471ad619af8ee987c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 6e5e8ba..0d206f3 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -1231,8 +1231,6 @@ static int dhcpv6_calc_refresh_timers(void)
 		t1 = l_t1;
 		t2 = l_t2;
 		t3 = l_t3;
-	} else {
-		t1 = 600;
 	}
 
 	return (int)(ia_pd_entries + ia_na_entries);
@@ -1370,8 +1368,7 @@ int dhcpv6_promote_server_cand(void)
 	size_t cand_len;
 	struct dhcpv6_server_cand *cand = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len);
 	uint16_t hdr[2];
-	int ret = (na_mode == IA_MODE_NONE && pd_mode == IA_MODE_NONE) ?
-			DHCPV6_STATELESS : DHCPV6_STATEFUL;
+	int ret = DHCPV6_STATELESS;
 
 	// Clear lingering candidate state info
 	odhcp6c_clear_state(STATE_SERVER_ID);