[PATCH 66/92] wpa_supplicant: Rename nan_config to nan_cluster_config

[Andrei Otcheretianski]

From: Avraham Stern <avraham.stern at intel.com>

Rename the nan_config variable to nan_cluster_config to differentiate
between the nan cluster config and the nan module config.

Signed-off-by: Avraham Stern <avraham.stern at intel.com>
---
 wpa_supplicant/nan_supplicant.c   | 45 +++++++++++++++++--------------
 wpa_supplicant/wpa_supplicant_i.h |  2 +-
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c
index 1f7578ac45..43c7a9c1ae 100644
--- a/wpa_supplicant/nan_supplicant.c
+++ b/wpa_supplicant/nan_supplicant.c
@@ -1117,33 +1117,38 @@ int wpas_nan_init(struct wpa_supplicant *wpa_s)
 	}
 
 	/* Set the default configuration */
-	os_memset(&wpa_s->nan_config, 0, sizeof(wpa_s->nan_config));
-
-	wpa_s->nan_config.master_pref = DEFAULT_NAN_MASTER_PREF;
-	wpa_s->nan_config.dual_band = DEFAULT_NAN_DUAL_BAND;
-	os_memset(wpa_s->nan_config.cluster_id, 0, ETH_ALEN);
-	wpa_s->nan_config.scan_period = DEFAULT_NAN_SCAN_PERIOD;
-	wpa_s->nan_config.scan_dwell_time = DEFAULT_NAN_SCAN_DWELL_TIME;
-	wpa_s->nan_config.discovery_beacon_interval =
+	os_memset(&wpa_s->nan_cluster_config, 0,
+		  sizeof(wpa_s->nan_cluster_config));
+
+	wpa_s->nan_cluster_config.master_pref = DEFAULT_NAN_MASTER_PREF;
+	wpa_s->nan_cluster_config.dual_band = DEFAULT_NAN_DUAL_BAND;
+	os_memset(wpa_s->nan_cluster_config.cluster_id, 0, ETH_ALEN);
+	wpa_s->nan_cluster_config.scan_period = DEFAULT_NAN_SCAN_PERIOD;
+	wpa_s->nan_cluster_config.scan_dwell_time = DEFAULT_NAN_SCAN_DWELL_TIME;
+	wpa_s->nan_cluster_config.discovery_beacon_interval =
 		DEFAULT_NAN_DISCOVERY_BEACON_INTERVAL;
 
-	wpa_s->nan_config.low_band_cfg.frequency =
+	wpa_s->nan_cluster_config.low_band_cfg.frequency =
 		DEFAULT_NAN_LOW_BAND_FREQUENCY;
-	wpa_s->nan_config.low_band_cfg.rssi_close = DEFAULT_NAN_RSSI_CLOSE;
-	wpa_s->nan_config.low_band_cfg.rssi_middle = DEFAULT_NAN_RSSI_MIDDLE;
-	wpa_s->nan_config.low_band_cfg.awake_dw_interval = true;
+	wpa_s->nan_cluster_config.low_band_cfg.rssi_close =
+		DEFAULT_NAN_RSSI_CLOSE;
+	wpa_s->nan_cluster_config.low_band_cfg.rssi_middle =
+		DEFAULT_NAN_RSSI_MIDDLE;
+	wpa_s->nan_cluster_config.low_band_cfg.awake_dw_interval = true;
 
-	wpa_s->nan_config.high_band_cfg.frequency =
+	wpa_s->nan_cluster_config.high_band_cfg.frequency =
 		DEFAULT_NAN_HIGH_BAND_FREQUENCY;
-	wpa_s->nan_config.high_band_cfg.rssi_close = DEFAULT_NAN_RSSI_CLOSE;
-	wpa_s->nan_config.high_band_cfg.rssi_middle = DEFAULT_NAN_RSSI_MIDDLE;
-	wpa_s->nan_config.high_band_cfg.awake_dw_interval = true;
+	wpa_s->nan_cluster_config.high_band_cfg.rssi_close =
+		DEFAULT_NAN_RSSI_CLOSE;
+	wpa_s->nan_cluster_config.high_band_cfg.rssi_middle =
+		DEFAULT_NAN_RSSI_MIDDLE;
+	wpa_s->nan_cluster_config.high_band_cfg.awake_dw_interval = true;
 
 	/* TODO: Optimize this, so that the notification are enabled only when
 	 * needed, i.e., when the DE is configured with unsolicited publish or
 	 * active subscribe
 	 */
-	wpa_s->nan_config.enable_dw_notif =
+	wpa_s->nan_cluster_config.enable_dw_notif =
 		!!(wpa_s->nan_capa.drv_flags &
 		   WPA_DRIVER_FLAGS_NAN_SUPPORT_USERSPACE_DE);
 
@@ -1186,7 +1191,7 @@ int wpas_nan_start(struct wpa_supplicant *wpa_s)
 	if (!wpas_nan_ready(wpa_s))
 		return -1;
 
-	return nan_start(wpa_s->nan, &wpa_s->nan_config);
+	return nan_start(wpa_s->nan, &wpa_s->nan_cluster_config);
 }
 
 
@@ -1213,7 +1218,7 @@ void wpas_nan_flush(struct wpa_supplicant *wpa_s)
 
 int wpas_nan_set(struct wpa_supplicant *wpa_s, char *cmd)
 {
-	struct nan_cluster_config *config = &wpa_s->nan_config;
+	struct nan_cluster_config *config = &wpa_s->nan_cluster_config;
 	char *param = os_strchr(cmd, ' ');
 
 	if (!param)
@@ -1388,7 +1393,7 @@ int wpas_nan_update_conf(struct wpa_supplicant *wpa_s)
 		return -1;
 
 	wpa_printf(MSG_DEBUG, "NAN: Update NAN configuration");
-	return nan_update_config(wpa_s->nan, &wpa_s->nan_config);
+	return nan_update_config(wpa_s->nan, &wpa_s->nan_cluster_config);
 }
 
 
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index f69685004f..00852986dd 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -1731,7 +1731,7 @@ struct wpa_supplicant {
 #define MAX_NAN_RADIOS 2
 	struct nan_capa nan_capa;
 	struct nan_data *nan;
-	struct nan_cluster_config nan_config;
+	struct nan_cluster_config nan_cluster_config;
 	u8 schedule_sequence_id;
 	struct nan_schedule_config nan_sched[MAX_NAN_RADIOS];
 	u16 nan_supported_csids;
-- 
2.53.0