Merge tag 'upstream/1.1.94'

Upstream version 1.1.94

1 files changed, 3 insertions, 3 deletions

diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c
index 72d28a7a..244d0715 100644
--- a/src/devices/tests/test-arping.c
+++ b/src/devices/tests/test-arping.c
@@ -79,7 +79,7 @@ test_arping_common (test_fixture *fixture, TestInfo *info)
 		g_assert (nm_arping_manager_add_address (manager, info->addresses[i]));
 
 	for (i = 0; info->peer_addresses[i]; i++) {
-		nmtstp_ip4_address_add (FALSE, fixture->ifindex1, info->peer_addresses[i],
+		nmtstp_ip4_address_add (NULL, FALSE, fixture->ifindex1, info->peer_addresses[i],
 		                        24, 0, 3600, 1800, 0, NULL);
 	}
 
@@ -126,13 +126,13 @@ fixture_teardown (test_fixture *fixture, gconstpointer user_data)
 }
 
 void
-init_tests (int *argc, char ***argv)
+_nmtstp_init_tests (int *argc, char ***argv)
 {
 	nmtst_init_with_logging (argc, argv, NULL, "ALL");
 }
 
 void
-setup_tests (void)
+_nmtstp_setup_tests (void)
 {
 	g_test_add ("/arping/1", test_fixture, NULL, fixture_setup, test_arping_1, fixture_teardown);
 	g_test_add ("/arping/2", test_fixture, NULL, fixture_setup, test_arping_2, fixture_teardown);