From d3217718a904ffd3b6f6cd12d14d526813d46d7a Mon Sep 17 00:00:00 2001 From: goldsimon Date: Tue, 23 Jun 2015 09:20:06 +0200 Subject: [PATCH] Reverted fix for bug #38203 since it might be wrong --- CHANGELOG | 3 --- src/core/dhcp.c | 1 - 2 files changed, 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5a15ef79..4327bc63 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -267,9 +267,6 @@ HISTORY 2015-03-20: Simon Goldschmidt * dhcp.c: fixed bug #38714 (Missing option and client address in DHCPRELEASE message) - 2015-03-20: Simon Goldschmidt - * dhcp.c: fixed bug #38203 (DHCP options are not recorded in all DHCP ack messages) - 2015-03-19: Simon Goldschmidt * api.h, tcpip.h, api_lib.c, api_msg.c: fixed race conditions in assigning netconn->last_err (fixed bugs #38121 and #37676) diff --git a/src/core/dhcp.c b/src/core/dhcp.c index 26195682..23b7eed3 100644 --- a/src/core/dhcp.c +++ b/src/core/dhcp.c @@ -1659,7 +1659,6 @@ dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, /* already bound to the given lease address? */ else if ((dhcp->state == DHCP_STATE_REBOOTING) || (dhcp->state == DHCP_STATE_REBINDING) || (dhcp->state == DHCP_STATE_RENEWING)) { - dhcp_handle_ack(netif); dhcp_bind(netif); } }