From bdb6eeb0670658255c2a4c3c501c0a27fa8cfe55 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Sep 2017 21:04:15 +0200 Subject: New upstream version 1.8.4 --- libnm-core/nm-setting-wired.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libnm-core/nm-setting-wired.c') 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. -- cgit 1.3.0-6-gf8a5