Merge tag 'upstream/1.0.2'

Upstream version 1.0.2

1 files changed, 2 insertions, 1 deletions

diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index 40315c6e..ae1edd82 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -49,7 +49,7 @@ nm_utils_ip6_route_metric_normalize (guint32 metric)
 	return metric ? metric : 1024 /*NM_PLATFORM_ROUTE_METRIC_DEFAULT_IP6*/;
 }
 
-int nm_spawn_process (const char *args);
+int nm_spawn_process (const char *args, GError **error);
 
 /* check if @flags has exactly one flag (@check) set. You should call this
  * only with @check being a compile time constant and a power of two. */
@@ -196,6 +196,7 @@ typedef struct {
 gboolean nm_utils_get_ipv6_interface_identifier (NMLinkType link_type,
                                                  const guint8 *hwaddr,
                                                  guint len,
+                                                 guint dev_id,
                                                  NMUtilsIPv6IfaceId *out_iid);
 
 void nm_utils_ipv6_addr_set_interface_identfier (struct in6_addr *addr,