Added brackets, completed CHANGELOG

This commit is contained in:
goldsimon 2012-09-26 21:30:01 +02:00
parent b4ac36337f
commit 99aea7eb6f
2 changed files with 1770 additions and 1767 deletions

View File

@ -80,6 +80,9 @@ HISTORY
++ Bugfixes: ++ Bugfixes:
2012-09-26: patch by Henrik Persson
* dhcp.c: patch #7843 Fix corner case with dhcp timeouts
2012-09-26: patch by Henrik Persson 2012-09-26: patch by Henrik Persson
* dhcp.c: patch #7840 Segfault in dhcp_parse_reply if no end marker in dhcp packet * dhcp.c: patch #7840 Segfault in dhcp_parse_reply if no end marker in dhcp packet

View File

@ -961,7 +961,7 @@ dhcp_bind(struct netif *netif)
} }
/* If we have sub 1 minute lease, t2 and t1 will kick in at the same time. */ /* If we have sub 1 minute lease, t2 and t1 will kick in at the same time. */
if (dhcp->t1_timeout >= dhcp->t2_timeout && dhcp->t2_timeout > 0) { if ((dhcp->t1_timeout >= dhcp->t2_timeout) && (dhcp->t2_timeout > 0)) {
dhcp->t1_timeout = 0; dhcp->t1_timeout = 0;
} }