mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2025-04-10 15:45:13 +00:00
Apply patch #10358: preserve dhcp memory type flag
This commit is contained in:
parent
f877b457a1
commit
31d8988f89
@ -773,9 +773,6 @@ dhcp_set_struct(struct netif *netif, struct dhcp *dhcp)
|
||||
* @ingroup dhcp4
|
||||
* Removes a struct dhcp from a netif.
|
||||
*
|
||||
* ATTENTION: Only use this when not using dhcp_set_struct() to allocate the
|
||||
* struct dhcp since the memory is passed back to the heap.
|
||||
*
|
||||
* @param netif the netif from which to remove the struct dhcp
|
||||
*/
|
||||
void dhcp_cleanup(struct netif *netif)
|
||||
@ -811,6 +808,7 @@ dhcp_start(struct netif *netif)
|
||||
{
|
||||
struct dhcp *dhcp;
|
||||
err_t result;
|
||||
u8_t saved_flags;
|
||||
|
||||
LWIP_ASSERT_CORE_LOCKED();
|
||||
LWIP_ERROR("netif != NULL", (netif != NULL), return ERR_ARG;);
|
||||
@ -846,9 +844,10 @@ dhcp_start(struct netif *netif)
|
||||
/* dhcp is cleared below, no need to reset flag*/
|
||||
}
|
||||
|
||||
/* clear data structure */
|
||||
/* clear data structure but preserve DHCP_FLAG_EXTERNAL_MEM for dhcp_cleanup() */
|
||||
saved_flags = dhcp->flags;
|
||||
memset(dhcp, 0, sizeof(struct dhcp));
|
||||
/* dhcp_set_state(&dhcp, DHCP_STATE_OFF); */
|
||||
dhcp->flags = saved_flags & DHCP_FLAG_EXTERNAL_MEM;
|
||||
|
||||
|
||||
#if LWIP_DHCP_DOES_ACD_CHECK
|
||||
|
Loading…
x
Reference in New Issue
Block a user