diff options
author | Dan Williams <dcbw@redhat.com> | 2010-06-25 19:57:30 -0700 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2010-06-25 19:57:30 -0700 |
commit | ac9d2804bd6c253224a41f77aa7d3c26ac789904 (patch) | |
tree | f82e39f92ffe76a96972c4610ee64b3140f445bf /libnm-util/nm-setting-wired.h | |
parent | 3f089fe41d779313dee4e91a6b48f3269f4d81b6 (diff) | |
parent | 91ab673b5c1af7ee0f2f4a483f24bcce940ac373 (diff) |
Merge remote branch 'origin/master' into zvm
Diffstat (limited to 'libnm-util/nm-setting-wired.h')
-rw-r--r-- | libnm-util/nm-setting-wired.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libnm-util/nm-setting-wired.h b/libnm-util/nm-setting-wired.h index 3efb8d48d3..ad89b3b229 100644 --- a/libnm-util/nm-setting-wired.h +++ b/libnm-util/nm-setting-wired.h @@ -57,6 +57,7 @@ GQuark nm_setting_wired_error_quark (void); #define NM_SETTING_WIRED_DUPLEX "duplex" #define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate" #define NM_SETTING_WIRED_MAC_ADDRESS "mac-address" +#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address" #define NM_SETTING_WIRED_MTU "mtu" #define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels" #define NM_SETTING_WIRED_S390_PORT_NAME "s390-port-name" @@ -86,6 +87,7 @@ guint32 nm_setting_wired_get_speed (NMSettingWired *setting const char * nm_setting_wired_get_duplex (NMSettingWired *setting); gboolean nm_setting_wired_get_auto_negotiate (NMSettingWired *setting); const GByteArray *nm_setting_wired_get_mac_address (NMSettingWired *setting); +const GByteArray *nm_setting_wired_get_cloned_mac_address (NMSettingWired *setting); guint32 nm_setting_wired_get_mtu (NMSettingWired *setting); const GPtrArray * nm_setting_wired_get_s390_subchannels (NMSettingWired *setting); const char * nm_setting_wired_get_s390_port_name (NMSettingWired *setting); |