From a84343123619ff8710b8b3b18e8220b64176cef6 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 15 May 2012 22:54:14 -0500 Subject: [PATCH] Revert "dhcp: allow some same-state transitions (rh #810744)" This reverts commit a5dfb5a48274cc6fe9052162456dcc9237eedda4. Screwed up the bug #. Dyslexia? Maybe... --- src/dhcp-manager/nm-dhcp-client.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index f6fec0a0f..16c6dd77a 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -570,20 +570,8 @@ nm_dhcp_client_new_options (NMDHCPClient *self, g_hash_table_remove_all (priv->options); g_hash_table_foreach (options, copy_option, priv->options); - 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; - } + if (old_state == new_state) + return; /* Handle changed device state */ if (state_is_bound (new_state)) {