colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "dhcp: allow some same-state transitions (rh #810744)"

Browse Source 
This reverts commit a5dfb5a482.

Screwed up the bug #.  Dyslexia?  Maybe...
This commit is contained in:
Dan Williams
2012-05-15 22:54:14 -05:00
parent a5dfb5a482
commit a843431236
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dhcp-manager/nm-dhcp-client.c
View File

@@ -570,20 +570,8 @@ nm_dhcp_client_new_options (NMDHCPClient *self,
g_hash_table_remove_all (priv->options); g_hash_table_remove_all (priv->options);
g_hash_table_foreach (options, copy_option, priv->options); g_hash_table_foreach (options, copy_option, priv->options);
if (old_state == new_state) { if (old_state == new_state)
/* dhclient will stay in the same state (or, really, provide the same
* reason) for operations like RENEW and REBIND. We need to ensure
* that triggers various DHCP lease change code, so we need to pass
* along same-state transitions for these states.
*/
if ( new_state != DHC_BOUND4
&& new_state != DHC_RENEW4
&& new_state != DHC_REBIND4
&& new_state != DHC_BOUND6
&& new_state != DHC_RENEW6
&& new_state != DHC_REBIND6)
return; return;
}
/* Handle changed device state */ /* Handle changed device state */
if (state_is_bound (new_state)) { if (state_is_bound (new_state)) {