diff options
| author | Michael Biebl <biebl@debian.org> | 2010-11-29 19:00:27 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-11-29 19:00:27 +0100 |
| commit | 90764db0c249831a00ca5506fc2913a418eb980a (patch) | |
| tree | 88199b4c694a5977b407670b54e5c160985b1399 /src/nm-device-ethernet.h | |
| parent | 262012122f6fdb67f1645c009beb5f8c477e5868 (diff) | |
| parent | a6b89d35fabd9f5934b84d7cde22e9268f92c3d3 (diff) | |
Merge commit 'upstream/0.8.2' into experimental
Diffstat (limited to 'src/nm-device-ethernet.h')
| -rw-r--r-- | src/nm-device-ethernet.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nm-device-ethernet.h b/src/nm-device-ethernet.h index 7bb3db00..b9e2afd4 100644 --- a/src/nm-device-ethernet.h +++ b/src/nm-device-ethernet.h @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2005 - 2008 Red Hat, Inc. + * Copyright (C) 2005 - 2010 Red Hat, Inc. * Copyright (C) 2006 - 2008 Novell, Inc. */ @@ -37,6 +37,7 @@ G_BEGIN_DECLS #define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) #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" |