Merge branch 'master' into dnssec

This commit is contained in:
Simon Kelley
2013-12-18 17:45:31 +00:00
6 changed files with 18 additions and 14 deletions

View File

@@ -581,7 +581,7 @@ struct dhcp_lease {
struct in6_addr addr6;
int iaid;
struct slaac_address {
struct in6_addr addr, local;
struct in6_addr addr;
time_t ping_time;
int backoff; /* zero -> confirmed */
struct slaac_address *next;