diff options
| author | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
| commit | 8254edbf64d60bef0d70eee01490103148dba100 (patch) | |
| tree | 282eb053995da653ee170e910da05d9530d4ff53 /libnm-core/nm-setting-wireless.c | |
| parent | 857e5310d1764114da056cd2eb3d88625bb0ba81 (diff) | |
| parent | 90e8691111889a7b5f3c812f5a41f15a8a058913 (diff) | |
Update upstream source from tag 'upstream/1.9.90'
Update to upstream version '1.9.90' with Debian dir 83533c23245795edf9fe4919e4af3e78f2938519
Diffstat (limited to 'libnm-core/nm-setting-wireless.c')
| -rw-r--r-- | libnm-core/nm-setting-wireless.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index 8ae84d4c..0a3915bf 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -41,7 +41,7 @@ **/ G_DEFINE_TYPE_WITH_CODE (NMSettingWireless, nm_setting_wireless, NM_TYPE_SETTING, - _nm_register_setting (WIRELESS, 1)) + _nm_register_setting (WIRELESS, NM_SETTING_PRIORITY_HW_BASE)) NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_WIRELESS) #define NM_SETTING_WIRELESS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRELESS, NMSettingWirelessPrivate)) @@ -1353,7 +1353,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) * If specified, request that the device use this MAC address instead. * This is known as MAC cloning or spoofing. * - * Beside explicitly specifing a MAC address, the special values "preserve", "permanent", + * Beside explicitly specifying 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. @@ -1447,7 +1447,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) * "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled * globally-administered, burned-in MAC address. * - * If the value contains more then one additional MAC addresses, one of + * If the value contains more than one additional MAC addresses, one of * them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" * will create a fully scrambled MAC address, randomly locally or globally * administered. |