about summary refs log tree commit diff
path: root/src/nm-types.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2019-03-26 23:26:14 +0100
committerMichael Biebl <biebl@debian.org>2019-03-26 23:26:14 +0100
commit9bc3ff81969c896f6bf8e1c93f98f43f6ffffaf8 (patch)
tree302fce2d1ab3a130ac0b684d168ab6312825fcd2 /src/nm-types.h
parentf97666c6bd29a3228443acd6401a407a19ec8d25 (diff)
parent9a6dcbf895f9da01768e64b73cec88c16157d91e (diff)
Update upstream source from tag 'upstream/1.16.0'
Update to upstream version '1.16.0'
with Debian dir a0f3ffb137940d423625faae8bedbaced4d34cda
Diffstat (limited to 'src/nm-types.h')
-rw-r--r--src/nm-types.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nm-types.h b/src/nm-types.h
index a0a7f620..b6b49028 100644
--- a/src/nm-types.h
+++ b/src/nm-types.h
@@ -37,7 +37,6 @@ typedef struct _NMAuthSubject        NMAuthSubject;
 typedef struct _NMDBusManager        NMDBusManager;
 typedef struct _NMConfig             NMConfig;
 typedef struct _NMConfigData         NMConfigData;
-typedef struct _NMAcdManager         NMAcdManager;
 typedef struct _NMConnectivity       NMConnectivity;
 typedef struct _NMDevice             NMDevice;
 typedef struct _NMDhcp4Config        NMDhcp4Config;
@@ -52,6 +51,7 @@ typedef struct _NMPolicy             NMPolicy;
 typedef struct _NMRfkillManager      NMRfkillManager;
 typedef struct _NMPacrunnerManager   NMPacrunnerManager;
 typedef struct _NMSessionMonitor     NMSessionMonitor;
+typedef struct _NMKeepAlive          NMKeepAlive;
 typedef struct _NMSleepMonitor       NMSleepMonitor;
 typedef struct _NMLldpListener       NMLldpListener;
 typedef struct _NMConfigDeviceStateData NMConfigDeviceStateData;
@@ -152,6 +152,7 @@ typedef enum {
 	NM_LINK_TYPE_WIMAX,
 	NM_LINK_TYPE_WPAN,
 	NM_LINK_TYPE_6LOWPAN,
+	NM_LINK_TYPE_WIFI_P2P,
 
 	/* Software types */
 	NM_LINK_TYPE_BNEP = 0x10000,   /* Bluetooth Ethernet emulation */