From 7d8baf4ac0480a542f000c1201df85427a22332c Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jeremy.bicha@canonical.com>
Date: Tue, 8 Feb 2022 12:07:45 -0500
Subject: New upstream version 1.35.90

---
 src/core/devices/nm-device-utils.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/core/devices/nm-device-utils.h')

diff --git a/src/core/devices/nm-device-utils.h b/src/core/devices/nm-device-utils.h
index 7200b0ea..7b879c90 100644
--- a/src/core/devices/nm-device-utils.h
+++ b/src/core/devices/nm-device-utils.h
@@ -73,23 +73,20 @@ const char *nm_device_sys_iface_state_to_string(NMDeviceSysIfaceState sys_iface_
 
 /*****************************************************************************/
 
-typedef enum {
+typedef enum _nm_packed {
     NM_DEVICE_IP_STATE_NONE,
-    NM_DEVICE_IP_STATE_WAIT,
-    NM_DEVICE_IP_STATE_CONF,
-    NM_DEVICE_IP_STATE_DONE,
-    NM_DEVICE_IP_STATE_FAIL,
+    NM_DEVICE_IP_STATE_PENDING,
+    NM_DEVICE_IP_STATE_READY,
+    NM_DEVICE_IP_STATE_FAILED,
 } NMDeviceIPState;
 
 const char *nm_device_ip_state_to_string(NMDeviceIPState ip_state);
 
 /*****************************************************************************/
 
-/*****************************************************************************/
-
 void nm_device_resolve_address(int                 addr_family,
                                gconstpointer       address,
-                               GCancellable *      cancellable,
+                               GCancellable       *cancellable,
                                GAsyncReadyCallback callback,
                                gpointer            cb_data);
 
-- 
cgit 1.3.0-6-gf8a5