From ec500391d61f87066fafd244cf5dcd3a2c8cd228 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 7 Nov 2022 23:16:48 +0100 Subject: [PATCH] libnm: remove nm_device_6lowpan_get_hw_address() Remove the function from a public header. It was missing from libnm.ver and thus never actually exported. There's no point in salvaging it now as it nm_device_get_hw_address() exists as a better option. (cherry picked from commit bd3239cf6cf5c1e3b5138b440781af624ec79f42) --- src/libnm-client-impl/nm-device-6lowpan.c | 21 --------------------- src/libnm-client-public/nm-device-6lowpan.h | 4 ---- 2 files changed, 25 deletions(-) diff --git a/src/libnm-client-impl/nm-device-6lowpan.c b/src/libnm-client-impl/nm-device-6lowpan.c index 39558f2542..737c84884c 100644 --- a/src/libnm-client-impl/nm-device-6lowpan.c +++ b/src/libnm-client-impl/nm-device-6lowpan.c @@ -49,27 +49,6 @@ nm_device_6lowpan_get_parent(NMDevice6Lowpan *device) return nml_dbus_property_o_get_obj(&NM_DEVICE_6LOWPAN_GET_PRIVATE(device)->parent); } -/** - * nm_device_6lowpan_get_hw_address: (skip) - * @device: a #NMDevice6Lowpan - * - * Gets the hardware (MAC) address of the #NMDevice6Lowpan - * - * Returns: the hardware address. This is the internal string used by the - * device, and must not be modified. - * - * Since: 1.14 - * - * Deprecated: 1.24: Use nm_device_get_hw_address() instead. - **/ -const char * -nm_device_6lowpan_get_hw_address(NMDevice6Lowpan *device) -{ - g_return_val_if_fail(NM_IS_DEVICE_6LOWPAN(device), NULL); - - return nm_device_get_hw_address(NM_DEVICE(device)); -} - /*****************************************************************************/ static void diff --git a/src/libnm-client-public/nm-device-6lowpan.h b/src/libnm-client-public/nm-device-6lowpan.h index d5f8a7a5c1..80c2a2858b 100644 --- a/src/libnm-client-public/nm-device-6lowpan.h +++ b/src/libnm-client-public/nm-device-6lowpan.h @@ -39,10 +39,6 @@ GType nm_device_6lowpan_get_type(void); NM_AVAILABLE_IN_1_14 NMDevice *nm_device_6lowpan_get_parent(NMDevice6Lowpan *device); -NM_AVAILABLE_IN_1_14 -NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) -const char *nm_device_6lowpan_get_hw_address(NMDevice6Lowpan *device); - G_END_DECLS #endif /* __NM_DEVICE_6LOWPAN_H__ */