From 93b347bcf24d73500dca8a0a5fc316bb44f565f2 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 16 Sep 2024 15:58:54 +0200 Subject: [PATCH] hsr: use HSR DBus metadata properly The HSR DBus metadata was defined properly but not exported on the libnm library properly. This was causing that clients were not showing the HSR devices. Fixes: 5426bdf4a122 ('HSR: add support to HSR/PRP interface') (cherry picked from commit 5e4696a693c83d2b875a1bee6d57c181d4f6e360) (cherry picked from commit 19929fdc9ad6c93ba5e44dda0b8ddbd5c00c21b6) (cherry picked from commit 029253e2f0f6d7240d87b6e7eadf701b4ad00023) --- src/libnm-client-impl/nm-libnm-utils.c | 1 + src/libnm-client-impl/nm-libnm-utils.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libnm-client-impl/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c index 9ebca2167f..8af234cea1 100644 --- a/src/libnm-client-impl/nm-libnm-utils.c +++ b/src/libnm-client-impl/nm-libnm-utils.c @@ -782,6 +782,7 @@ const NMLDBusMetaIface *const _nml_dbus_meta_ifaces[] = { &_nml_dbus_meta_iface_nm_device_bridge, &_nml_dbus_meta_iface_nm_device_dummy, &_nml_dbus_meta_iface_nm_device_generic, + &_nml_dbus_meta_iface_nm_device_hsr, &_nml_dbus_meta_iface_nm_device_iptunnel, &_nml_dbus_meta_iface_nm_device_infiniband, &_nml_dbus_meta_iface_nm_device_loopback, diff --git a/src/libnm-client-impl/nm-libnm-utils.h b/src/libnm-client-impl/nm-libnm-utils.h index 53fa36be18..f3f586cc53 100644 --- a/src/libnm-client-impl/nm-libnm-utils.h +++ b/src/libnm-client-impl/nm-libnm-utils.h @@ -579,7 +579,7 @@ struct _NMLDBusMetaIface { NML_DBUS_META_IFACE_OBJ_PROPERTIES(), \ ##__VA_ARGS__) -extern const NMLDBusMetaIface *const _nml_dbus_meta_ifaces[45]; +extern const NMLDBusMetaIface *const _nml_dbus_meta_ifaces[46]; extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm; extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_accesspoint; @@ -593,6 +593,7 @@ extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_bond; extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_bridge; extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_dummy; extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_generic; +extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_hsr; extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_infiniband; extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_iptunnel; extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_loopback;