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

merge: branch 'jv/fix-qos-mapping'

Browse source 
platform/vlan: fix incorrect type for ingress/egress qos mappings

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2109

(cherry picked from commit 191aaf0fb2)

(cherry picked from commit f1fc7bd218)

(cherry picked from commit b07f4a058c)
This commit is contained in:
Jan Vaclav 2025-01-16 11:09:13 +00:00 • committed by Beniamino Galvani
commit 9910c8a563
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/platform/tests/test-link.c
View file

@ -2263,7 +2263,7 @@ test_software_detect_add(const char *testpath, NMLinkType link_type, int test_mo
} }
/*****************************************************************************/ /*****************************************************************************/
/*
static void static void
_assert_xgress_qos_mappings_impl(int ifindex, gboolean is_ingress_map, int n_entries, int n, ...) _assert_xgress_qos_mappings_impl(int ifindex, gboolean is_ingress_map, int n_entries, int n, ...)
{ {
@ -2343,8 +2343,7 @@ _assert_vlan_flags(int ifindex, _NMVlanFlags flags)
g_assert(plnk); g_assert(plnk);
g_assert_cmpint(plnk->flags, ==, flags); g_assert_cmpint(plnk->flags, ==, flags);
} }
*/
/*
static void static void
test_vlan_set_xgress(void) test_vlan_set_xgress(void)
{ {
@ -2360,7 +2359,6 @@ test_vlan_set_xgress(void)
ifindex = ifindex =
nmtstp_assert_wait_for_link(NM_PLATFORM_GET, DEVICE_NAME, NM_LINK_TYPE_VLAN, 100)->ifindex; nmtstp_assert_wait_for_link(NM_PLATFORM_GET, DEVICE_NAME, NM_LINK_TYPE_VLAN, 100)->ifindex;
g_assert(nm_platform_link_vlan_set_ingress_map(NM_PLATFORM_GET, ifindex, 4, 5)); g_assert(nm_platform_link_vlan_set_ingress_map(NM_PLATFORM_GET, ifindex, 4, 5));
_assert_ingress_qos_mappings(ifindex, 1, 4, 5); _assert_ingress_qos_mappings(ifindex, 1, 4, 5);
@ -2391,7 +2389,6 @@ test_vlan_set_xgress(void)
g_assert(nm_platform_link_vlan_set_ingress_map(NM_PLATFORM_GET, ifindex, 9, 4)); g_assert(nm_platform_link_vlan_set_ingress_map(NM_PLATFORM_GET, ifindex, 9, 4));
_assert_ingress_qos_mappings(ifindex, 3, 0, 5, 3, 8, 4, 5); _assert_ingress_qos_mappings(ifindex, 3, 0, 5, 3, 8, 4, 5);
g_assert(nm_platform_link_vlan_set_egress_map(NM_PLATFORM_GET, ifindex, 7, 3)); g_assert(nm_platform_link_vlan_set_egress_map(NM_PLATFORM_GET, ifindex, 7, 3));
_assert_egress_qos_mappings(ifindex, 1, 7, 3); _assert_egress_qos_mappings(ifindex, 1, 7, 3);
@ -2693,7 +2690,7 @@ test_vlan_set_xgress(void)
nmtstp_link_delete(NULL, -1, ifindex, DEVICE_NAME, TRUE); nmtstp_link_delete(NULL, -1, ifindex, DEVICE_NAME, TRUE);
nmtstp_link_delete(NULL, -1, ifindex_parent, PARENT_NAME, TRUE); nmtstp_link_delete(NULL, -1, ifindex_parent, PARENT_NAME, TRUE);
} }
*/
/*****************************************************************************/ /*****************************************************************************/
static void static void
@ -4107,7 +4104,7 @@ _nmtstp_setup_tests(void)
test_software_detect_add("/link/software/detect/wireguard/1", NM_LINK_TYPE_WIREGUARD, 1); test_software_detect_add("/link/software/detect/wireguard/1", NM_LINK_TYPE_WIREGUARD, 1);
test_software_detect_add("/link/software/detect/wireguard/2", NM_LINK_TYPE_WIREGUARD, 2); test_software_detect_add("/link/software/detect/wireguard/2", NM_LINK_TYPE_WIREGUARD, 2);
// g_test_add_func("/link/software/vlan/set-xgress", test_vlan_set_xgress); g_test_add_func("/link/software/vlan/set-xgress", test_vlan_set_xgress);
g_test_add_func("/link/set-properties", test_link_set_properties); g_test_add_func("/link/set-properties", test_link_set_properties);

4
src/libnm-platform/nm-linux-platform.c
View file

@ -5399,7 +5399,7 @@ _nl_msg_new_link_set_linkinfo_vlan(struct nl_msg *msg,
if (!(qos = nla_nest_start(msg, IFLA_VLAN_INGRESS_QOS))) if (!(qos = nla_nest_start(msg, IFLA_VLAN_INGRESS_QOS)))
goto nla_put_failure; goto nla_put_failure;
} }
NLA_PUT(msg, i, sizeof(ingress_qos[i]), &ingress_qos[i]); NLA_PUT(msg, IFLA_VLAN_QOS_MAPPING, sizeof(ingress_qos[i]), &ingress_qos[i]);
} }
} }
@ -5416,7 +5416,7 @@ _nl_msg_new_link_set_linkinfo_vlan(struct nl_msg *msg,
if (!(qos = nla_nest_start(msg, IFLA_VLAN_EGRESS_QOS))) if (!(qos = nla_nest_start(msg, IFLA_VLAN_EGRESS_QOS)))
goto nla_put_failure; goto nla_put_failure;
} }
NLA_PUT(msg, i, sizeof(egress_qos[i]), &egress_qos[i]); NLA_PUT(msg, IFLA_VLAN_QOS_MAPPING, sizeof(egress_qos[i]), &egress_qos[i]);
} }
} }