From 4cab0b170c44caba4eeb540d112294c652c6b7c3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 27 Nov 2020 09:51:09 +0100 Subject: [PATCH] core: recognize "wifi.scan-generate-mac-address-mask" as valid "NetworkManager.conf" option Fixes: 32f4abe90b72 ('config: warn about unknown keys in config files') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/595 (cherry picked from commit d615b902d8ded3f5de36704a3f3f00680899b40b) (cherry picked from commit 3b1ae89d2fa5b612a9a87a8949100aa264c40a86) (cherry picked from commit def7533c64d6c4aaedc23771cf0c8153ab84cd76) --- src/devices/wifi/nm-device-wifi.c | 2 +- src/nm-config.c | 1 + src/nm-config.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 807fc77ef2..6d367845db 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -1391,7 +1391,7 @@ _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset) priv->hw_addr_scan_expire = now + SCAN_RAND_MAC_ADDRESS_EXPIRE_SEC; generate_mac_address_mask = nm_config_data_get_device_config (NM_CONFIG_GET_DATA, - "wifi.scan-generate-mac-address-mask", + NM_CONFIG_KEYFILE_KEY_DEVICE_WIFI_SCAN_GENERATE_MAC_ADDRESS_MASK, device, NULL); diff --git a/src/nm-config.c b/src/nm-config.c index 63347db7bb..46af1d9571 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -818,6 +818,7 @@ static const ConfigGroup config_groups[] = { NM_CONFIG_KEYFILE_KEY_DEVICE_SRIOV_NUM_VFS, NM_CONFIG_KEYFILE_KEY_DEVICE_WIFI_BACKEND, NM_CONFIG_KEYFILE_KEY_DEVICE_WIFI_SCAN_RAND_MAC_ADDRESS, + NM_CONFIG_KEYFILE_KEY_DEVICE_WIFI_SCAN_GENERATE_MAC_ADDRESS_MASK, NM_CONFIG_KEYFILE_KEY_MATCH_DEVICE, NM_CONFIG_KEYFILE_KEY_STOP_MATCH, ), diff --git a/src/nm-config.h b/src/nm-config.h index b4478ceb04..76d879e07b 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -85,6 +85,7 @@ #define NM_CONFIG_KEYFILE_KEY_DEVICE_SRIOV_NUM_VFS "sriov-num-vfs" #define NM_CONFIG_KEYFILE_KEY_DEVICE_WIFI_BACKEND "wifi.backend" #define NM_CONFIG_KEYFILE_KEY_DEVICE_WIFI_SCAN_RAND_MAC_ADDRESS "wifi.scan-rand-mac-address" +#define NM_CONFIG_KEYFILE_KEY_DEVICE_WIFI_SCAN_GENERATE_MAC_ADDRESS_MASK "wifi.scan-generate-mac-address-mask" #define NM_CONFIG_KEYFILE_KEY_DEVICE_CARRIER_WAIT_TIMEOUT "carrier-wait-timeout" #define NM_CONFIG_KEYFILE_KEY_MATCH_DEVICE "match-device"