Merge tag 'upstream/1.8.0' into experimental

Upstream version 1.8.0

1 files changed, 6 insertions, 2 deletions

diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h
index c196421b..557041c9 100644
--- a/src/nm-ip6-config.h
+++ b/src/nm-ip6-config.h
@@ -61,8 +61,12 @@ NMIP6Config * nm_ip6_config_new_cloned (const NMIP6Config *src);
 int nm_ip6_config_get_ifindex (const NMIP6Config *config);
 
 
-NMIP6Config *nm_ip6_config_capture (int ifindex, gboolean capture_resolv_conf, NMSettingIP6ConfigPrivacy use_temporary);
-gboolean nm_ip6_config_commit (const NMIP6Config *config, int ifindex, gboolean routes_full_sync);
+NMIP6Config *nm_ip6_config_capture (NMPlatform *platform, int ifindex, gboolean capture_resolv_conf, NMSettingIP6ConfigPrivacy use_temporary);
+gboolean nm_ip6_config_commit (const NMIP6Config *config,
+                               NMPlatform *platform,
+                               NMRouteManager *route_manager,
+                               int ifindex,
+                               gboolean routes_full_sync);
 void nm_ip6_config_merge_setting (NMIP6Config *config, NMSettingIPConfig *setting, guint32 default_route_metric);
 NMSetting *nm_ip6_config_create_setting (const NMIP6Config *config);