From e3bd57575819ff7db26541164746443f1fa203a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Mon, 16 Dec 2013 16:36:49 +0100 Subject: [PATCH] cli: simplify getting device hardware addresses --- cli/src/devices.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/cli/src/devices.c b/cli/src/devices.c index 42576a3fbc..223f3ebdb2 100644 --- a/cli/src/devices.c +++ b/cli/src/devices.c @@ -670,25 +670,9 @@ show_device_info (NMDevice *device, NmCli *nmc) arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (nmc->output_data, arr); - if (NM_IS_DEVICE_ETHERNET (device)) - hwaddr = nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (device)); - else if (NM_IS_DEVICE_WIFI (device)) - hwaddr = nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (device)); -#if WITH_WIMAX - else if (NM_IS_DEVICE_WIMAX (device)) - hwaddr = nm_device_wimax_get_hw_address (NM_DEVICE_WIMAX (device)); -#endif - else if (NM_IS_DEVICE_INFINIBAND (device)) - hwaddr = nm_device_infiniband_get_hw_address (NM_DEVICE_INFINIBAND (device)); - else if (NM_IS_DEVICE_BOND (device)) - hwaddr = nm_device_bond_get_hw_address (NM_DEVICE_BOND (device)); - else if (NM_IS_DEVICE_VLAN (device)) - hwaddr = nm_device_vlan_get_hw_address (NM_DEVICE_VLAN (device)); - else if (NM_IS_DEVICE_BRIDGE (device)) - hwaddr = nm_device_bridge_get_hw_address (NM_DEVICE_BRIDGE (device)); - state_str = g_strdup_printf ("%d (%s)", state, nmc_device_state_to_string (state)); reason_str = g_strdup_printf ("%d (%s)", reason, nmc_device_reason_to_string (reason)); + hwaddr = nm_device_get_hw_address (device); acon = nm_device_get_active_connection (device); arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);