[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
This commit is contained in:
Cameron Gutman 2012-01-13 22:56:22 +00:00
parent ee49cc8fca
commit 5335d1ce21

View file

@ -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 */