From e59259b3d5016646a1b63da5e2371902389367b4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 21 Aug 2020 13:44:56 +0200 Subject: platform/tests: remove unused argument "out_not_supported" from nmtstp_link_bridge_add() --- src/platform/tests/test-common.c | 4 +--- src/platform/tests/test-common.h | 3 +-- src/platform/tests/test-link.c | 12 +++--------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 34ec2e1506..d3bb78a906 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -1176,8 +1176,7 @@ const NMPlatformLink * nmtstp_link_bridge_add (NMPlatform *platform, gboolean external_command, const char *name, - const NMPlatformLnkBridge *lnk, - gboolean *out_not_supported) + const NMPlatformLnkBridge *lnk) { const NMPlatformLink *pllink = NULL; const NMPlatformLnkBridge *ll = NULL; @@ -1185,7 +1184,6 @@ nmtstp_link_bridge_add (NMPlatform *platform, g_assert (nm_utils_ifname_valid_kernel (name, NULL)); - NM_SET_OUT (out_not_supported, FALSE); external_command = nmtstp_run_command_check_external (external_command); _init_platform (&platform, external_command); diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h index 38083ae9ea..050ea23e8f 100644 --- a/src/platform/tests/test-common.h +++ b/src/platform/tests/test-common.h @@ -326,8 +326,7 @@ void nmtstp_link_set_updown (NMPlatform *platform, const NMPlatformLink *nmtstp_link_bridge_add (NMPlatform *platform, gboolean external_command, const char *name, - const NMPlatformLnkBridge *lnk, - gboolean *out_not_supported); + const NMPlatformLnkBridge *lnk); const NMPlatformLink *nmtstp_link_veth_add (NMPlatform *platform, gboolean external_command, const char *name, diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index a2f981606f..2fb8b23600 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -962,9 +962,8 @@ test_software_detect (gconstpointer user_data) ifindex_parent = nmtstp_assert_wait_for_link (NM_PLATFORM_GET, PARENT_NAME, NM_LINK_TYPE_DUMMY, 100)->ifindex; switch (test_data->link_type) { - case NM_LINK_TYPE_BRIDGE: { - gboolean not_supported; + case NM_LINK_TYPE_BRIDGE: lnk_bridge.forward_delay = 1560; lnk_bridge.hello_time = 150; lnk_bridge.max_age = 2100; @@ -988,15 +987,10 @@ test_software_detect (gconstpointer user_data) lnk_bridge.mcast_query_response_interval = 5200; lnk_bridge.mcast_startup_query_interval = 3000; - if (!nmtstp_link_bridge_add (NULL, ext, DEVICE_NAME, &lnk_bridge, ¬_supported)) { - if (not_supported) { - g_test_skip ("Cannot create Bridge interface because of missing kernel support"); - goto out_delete_parent; - } + if (!nmtstp_link_bridge_add (NULL, ext, DEVICE_NAME, &lnk_bridge)) g_error ("Failed adding Bridge interface"); - } break; - } + case NM_LINK_TYPE_GRE: { gboolean gracefully_skip = FALSE; -- cgit v1.2.1