fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 17:00:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform/tests: remove unused argument "out_not_supported" from nmtstp_link_bridge_add()

Browse source
This commit is contained in:
Thomas Haller 2020-08-21 13:44:56 +02:00
parent 9a5e8f1ea6
commit e59259b3d5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/platform/tests/test-common.c
View file

@ -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);

3
src/platform/tests/test-common.h
View file

@ -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,

12
src/platform/tests/test-link.c
View file

@ -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, &not_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;