From 5335d1ce21a3e67931ac9ad31b1447877b5069a6 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 13 Jan 2012 22:56:22 +0000 Subject: [PATCH] [DHCPCSVC] - Adapt the reconnect hack to also enable DHCP when transitioning from static configuration to DHCP enabled via netcfgx svn path=/branches/wlan-bringup/; revision=54945 --- dll/win32/dhcpcsvc/dhcp/adapter.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dll/win32/dhcpcsvc/dhcp/adapter.c b/dll/win32/dhcpcsvc/dhcp/adapter.c index 41b94d332c0..2888db16a87 100644 --- a/dll/win32/dhcpcsvc/dhcp/adapter.c +++ b/dll/win32/dhcpcsvc/dhcp/adapter.c @@ -210,10 +210,11 @@ IsReconnectHackNeeded(PDHCP_ADAPTER Adapter, const MIB_IFROW* IfEntry) proto = find_protocol_by_adapter(&Adapter->DhclientInfo); - if (!proto) + if (Adapter->DhclientInfo.client->state == S_BOUND && !proto) return FALSE; - if (Adapter->DhclientInfo.client->state != S_BOUND) + if (Adapter->DhclientInfo.client->state != S_BOUND && + Adapter->DhclientInfo.client->state != S_STATIC) return FALSE; ApiUnlock(); @@ -331,7 +332,8 @@ DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) { { /* This handles a disconnect/reconnect */ - remove_protocol(proto); + if (proto) + remove_protocol(proto); Adapter->DhclientInfo.client->state = S_INIT; /* These are already invalid since the media state change */