about summary refs log tree commit diff
path: root/src/devices/nm-device-private.h
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-07-27 17:08:17 +0200
committerSebastien Bacher <seb128@ubuntu.com>2020-07-27 17:09:21 +0200
commitc75fd9f7edaeaec5bc520b1e73afa83063cdc279 (patch)
treecb044da62877cf9e3536a4d4e377cd3f20721ca8 /src/devices/nm-device-private.h
parent68b70c827c50c51b5361c3cdd1764ff569b85d94 (diff)
parentf86436e83639986f20fb44663edcccf36c3c150c (diff)
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'src/devices/nm-device-private.h')
-rw-r--r--src/devices/nm-device-private.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h
index 4e260da2..cd72f3d7 100644
--- a/src/devices/nm-device-private.h
+++ b/src/devices/nm-device-private.h
@@ -62,7 +62,7 @@ gboolean nm_device_bring_up (NMDevice *self, gboolean wait, gboolean *no_firmwar
 
 void nm_device_take_down (NMDevice *self, gboolean block);
 
-gboolean nm_device_take_over_link (NMDevice *self, int ifindex, char **old_name);
+gboolean nm_device_take_over_link (NMDevice *self, int ifindex, char **old_name, GError **error);
 
 gboolean nm_device_hw_addr_set (NMDevice *device,
                                 const char *addr,