From e3bd3278e9e9105cf53a867c494e836dc4b89682 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 7 May 2013 16:11:12 -0400 Subject: [PATCH] core: belatedly remove "hw-address" property #defines --- src/devices/nm-device-bond.h | 1 - src/devices/nm-device-bridge.h | 1 - src/devices/nm-device-bt.h | 1 - src/devices/nm-device-ethernet.h | 1 - src/devices/nm-device-generic.h | 1 - src/devices/nm-device-infiniband.h | 1 - src/devices/nm-device-olpc-mesh.h | 1 - src/devices/nm-device-vlan.h | 1 - src/devices/nm-device-wifi.h | 1 - src/devices/wimax/nm-device-wimax.h | 1 - 10 files changed, 10 deletions(-) diff --git a/src/devices/nm-device-bond.h b/src/devices/nm-device-bond.h index eeca560614..edbc86911b 100644 --- a/src/devices/nm-device-bond.h +++ b/src/devices/nm-device-bond.h @@ -40,7 +40,6 @@ typedef enum { NM_BOND_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMBondError; -#define NM_DEVICE_BOND_HW_ADDRESS "hw-address" #define NM_DEVICE_BOND_CARRIER "carrier" #define NM_DEVICE_BOND_SLAVES "slaves" diff --git a/src/devices/nm-device-bridge.h b/src/devices/nm-device-bridge.h index bf0ed01e8d..e84daa9c56 100644 --- a/src/devices/nm-device-bridge.h +++ b/src/devices/nm-device-bridge.h @@ -40,7 +40,6 @@ typedef enum { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMBridgeError; -#define NM_DEVICE_BRIDGE_HW_ADDRESS "hw-address" #define NM_DEVICE_BRIDGE_CARRIER "carrier" #define NM_DEVICE_BRIDGE_SLAVES "slaves" diff --git a/src/devices/nm-device-bt.h b/src/devices/nm-device-bt.h index 9382ee254f..64d0760eb0 100644 --- a/src/devices/nm-device-bt.h +++ b/src/devices/nm-device-bt.h @@ -39,7 +39,6 @@ typedef enum { NM_BT_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMBtError; -#define NM_DEVICE_BT_HW_ADDRESS "hw-address" #define NM_DEVICE_BT_NAME "name" #define NM_DEVICE_BT_CAPABILITIES "bt-capabilities" diff --git a/src/devices/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h index deb0fecad6..463bd62a75 100644 --- a/src/devices/nm-device-ethernet.h +++ b/src/devices/nm-device-ethernet.h @@ -42,7 +42,6 @@ typedef enum NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMEthernetError; -#define NM_DEVICE_ETHERNET_HW_ADDRESS "hw-address" #define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address" #define NM_DEVICE_ETHERNET_SPEED "speed" #define NM_DEVICE_ETHERNET_CARRIER "carrier" diff --git a/src/devices/nm-device-generic.h b/src/devices/nm-device-generic.h index e2609e238e..95634598bc 100644 --- a/src/devices/nm-device-generic.h +++ b/src/devices/nm-device-generic.h @@ -41,7 +41,6 @@ typedef enum NM_DEVICE_GENERIC_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMDeviceGenericError; -#define NM_DEVICE_GENERIC_HW_ADDRESS "hw-address" #define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description" typedef struct { diff --git a/src/devices/nm-device-infiniband.h b/src/devices/nm-device-infiniband.h index fe88c9013c..983ede6a4f 100644 --- a/src/devices/nm-device-infiniband.h +++ b/src/devices/nm-device-infiniband.h @@ -40,7 +40,6 @@ typedef enum { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMInfinibandError; -#define NM_DEVICE_INFINIBAND_HW_ADDRESS "hw-address" #define NM_DEVICE_INFINIBAND_CARRIER "carrier" typedef struct { diff --git a/src/devices/nm-device-olpc-mesh.h b/src/devices/nm-device-olpc-mesh.h index 9d42ecfaf6..6f44fb52d7 100644 --- a/src/devices/nm-device-olpc-mesh.h +++ b/src/devices/nm-device-olpc-mesh.h @@ -49,7 +49,6 @@ typedef enum NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMOlpcMeshError; -#define NM_DEVICE_OLPC_MESH_HW_ADDRESS "hw-address" #define NM_DEVICE_OLPC_MESH_COMPANION "companion" #define NM_DEVICE_OLPC_MESH_BITRATE "bitrate" #define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel" diff --git a/src/devices/nm-device-vlan.h b/src/devices/nm-device-vlan.h index 7c5fa24c99..68b1299320 100644 --- a/src/devices/nm-device-vlan.h +++ b/src/devices/nm-device-vlan.h @@ -40,7 +40,6 @@ typedef enum { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMVlanError; -#define NM_DEVICE_VLAN_HW_ADDRESS "hw-address" #define NM_DEVICE_VLAN_CARRIER "carrier" #define NM_DEVICE_VLAN_ID "vlan-id" diff --git a/src/devices/nm-device-wifi.h b/src/devices/nm-device-wifi.h index 368d0b800c..d4f16e062b 100644 --- a/src/devices/nm-device-wifi.h +++ b/src/devices/nm-device-wifi.h @@ -51,7 +51,6 @@ typedef enum { NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED, /*< nick=AdhocModeUnsupported >*/ } NMWifiError; -#define NM_DEVICE_WIFI_HW_ADDRESS "hw-address" #define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address" #define NM_DEVICE_WIFI_MODE "mode" #define NM_DEVICE_WIFI_BITRATE "bitrate" diff --git a/src/devices/wimax/nm-device-wimax.h b/src/devices/wimax/nm-device-wimax.h index c43c5dd2d3..4926edddd5 100644 --- a/src/devices/wimax/nm-device-wimax.h +++ b/src/devices/wimax/nm-device-wimax.h @@ -43,7 +43,6 @@ typedef enum NM_WIMAX_ERROR_NSP_NOT_FOUND, /*< nick=NspNotFound >*/ } NMWimaxError; -#define NM_DEVICE_WIMAX_HW_ADDRESS "hw-address" #define NM_DEVICE_WIMAX_ACTIVE_NSP "active-nsp" #define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency" #define NM_DEVICE_WIMAX_RSSI "rssi"