diff options
| author | Michael Biebl <biebl@debian.org> | 2017-09-20 21:04:15 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-09-20 21:04:15 +0200 |
| commit | bdb6eeb0670658255c2a4c3c501c0a27fa8cfe55 (patch) | |
| tree | 7f6a4560c8cd3e1730df2af4ed6c3e4c5c0265f6 /libnm-core/nm-setting-wired.c | |
| parent | b9f0451fa35393ceedf6d9d20b78c43578ebea5d (diff) | |
New upstream version 1.8.4 upstream/1.8.4
Diffstat (limited to 'libnm-core/nm-setting-wired.c')
| -rw-r--r-- | libnm-core/nm-setting-wired.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 5569f558..5476e357 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -1150,7 +1150,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) * Beside explicitly specifing a MAC address, the special values "preserve", "permanent", * "random" and "stable" are supported. * "preserve" means not to touch the MAC address on activation. - * "permanent" means to use the permanent hardware address of the device. + * "permanent" means to use the permanent hardware address if the device + * has one (otherwise this is treated as "preserve"). * "random" creates a random MAC address on each connect. * "stable" creates a hashed MAC address based on connection.stable-id and a * machine dependent key. |