about summary refs log tree commit diff
path: root/src/dhcp
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-01-29 10:37:20 +0100
committerSebastien Bacher <seb128@ubuntu.com>2020-01-29 10:37:20 +0100
commitff7ca6f26bc6763f53920c85e2c3b66259003527 (patch)
tree19de30bc725005d8972eb08d500c1b01d7c35101 /src/dhcp
parent5a09f7759860f4f2a9bb01471ca8099cd705bc10 (diff)
parent55780b62324ba5492ce2670817fc0a8c209cc138 (diff)
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'src/dhcp')
-rw-r--r--src/dhcp/nm-dhcp-nettools.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index 1f76c64c..b4c0a451 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -1028,10 +1028,10 @@ dhcp4_event_handle (NMDhcpNettools *self,
 			_LOGW ("selecting lease failed: %d", r);
 		}
 		break;
+	case N_DHCP4_CLIENT_EVENT_RETRACTED:
 	case N_DHCP4_CLIENT_EVENT_EXPIRED:
 		nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_EXPIRE, NULL, NULL);
 		break;
-	case N_DHCP4_CLIENT_EVENT_RETRACTED:
 	case N_DHCP4_CLIENT_EVENT_CANCELLED:
 		nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL);
 		break;