From 810f29140a6025bf70b0d316be92c2aeaee510bd Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Thu, 7 Jan 2021 14:37:38 +0100 Subject: [PATCH] sd-netlink: Add VLan QOS map properties --- src/libsystemd/sd-netlink/netlink-types.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c index f5e5fdf3afc..710e5ef215f 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -152,13 +152,20 @@ static const NLType rtnl_link_info_data_bridge_types[] = { [IFLA_BR_MCAST_IGMP_VERSION] = { .type = NETLINK_TYPE_U8 }, }; +static const NLType rtnl_vlan_qos_map_types[] = { + [IFLA_VLAN_QOS_MAPPING] = { .size = sizeof(struct ifla_vlan_qos_mapping) }, +}; + +static const NLTypeSystem rtnl_vlan_qos_map_type_system = { + .count = ELEMENTSOF(rtnl_vlan_qos_map_types), + .types = rtnl_vlan_qos_map_types, +}; + static const NLType rtnl_link_info_data_vlan_types[] = { [IFLA_VLAN_ID] = { .type = NETLINK_TYPE_U16 }, -/* - [IFLA_VLAN_FLAGS] = { .len = sizeof(struct ifla_vlan_flags) }, - [IFLA_VLAN_EGRESS_QOS] = { .type = NETLINK_TYPE_NESTED }, - [IFLA_VLAN_INGRESS_QOS] = { .type = NETLINK_TYPE_NESTED }, -*/ + [IFLA_VLAN_FLAGS] = { .size = sizeof(struct ifla_vlan_flags) }, + [IFLA_VLAN_EGRESS_QOS] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_vlan_qos_map_type_system }, + [IFLA_VLAN_INGRESS_QOS] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_vlan_qos_map_type_system }, [IFLA_VLAN_PROTOCOL] = { .type = NETLINK_TYPE_U16 }, };