Merge tag 'upstream/1.1.90' into experimental

Upstream version 1.1.90

1 files changed, 4 insertions, 0 deletions

diff --git a/libnm/nm-types.h b/libnm/nm-types.h
index ee1ed643..be09daaf 100644
--- a/libnm/nm-types.h
+++ b/libnm/nm-types.h
@@ -37,10 +37,14 @@ typedef struct _NMDeviceBt          NMDeviceBt;
 typedef struct _NMDeviceEthernet    NMDeviceEthernet;
 typedef struct _NMDeviceGeneric     NMDeviceGeneric;
 typedef struct _NMDeviceInfiniband  NMDeviceInfiniband;
+typedef struct _NMDeviceIPTunnel    NMDeviceIPTunnel;
+typedef struct _NMDeviceMacvlan     NMDeviceMacvlan;
 typedef struct _NMDeviceModem       NMDeviceModem;
 typedef struct _NMDeviceOlpcMesh    NMDeviceOlpcMesh;
 typedef struct _NMDeviceTeam        NMDeviceTeam;
+typedef struct _NMDeviceTun         NMDeviceTun;
 typedef struct _NMDeviceVlan        NMDeviceVlan;
+typedef struct _NMDeviceVxlan       NMDeviceVxlan;
 typedef struct _NMDeviceWifi        NMDeviceWifi;
 typedef struct _NMDeviceWimax       NMDeviceWimax;
 typedef struct _NMDhcpConfig        NMDhcpConfig;