[PATCH 19/92] NAN: Keep NAN pairing data in one place

[Andrei Otcheretianski]

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

The indications for peer pairing and NPK caching support parsed from
the peer Device Capability Extension attribute (DCEA) are saved in
nan_peer_info. Instead, save it in the nan_peer_pairing_data struct
which holds all the pairing related info.

Signed-off-by: Avraham Stern <avraham.stern at intel.com>
---
 src/nan/nan.c   | 8 ++++----
 src/nan/nan_i.h | 5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/nan/nan.c b/src/nan/nan.c
index b49c4a4ad3..6904b12815 100644
--- a/src/nan/nan.c
+++ b/src/nan/nan.c
@@ -983,9 +983,9 @@ static void nan_parse_peer_dev_capa_ext(struct nan_data *nan,
 	if (!attrs->dev_capa_ext || attrs->dev_capa_ext_len <= 1)
 		return;
 
-	peer->info.pairing_support = attrs->dev_capa_ext[1] &
+	peer->pairing.pairing_cfg.pairing_setup = attrs->dev_capa_ext[1] &
 		NAN_DEV_CAPA_EXT_INFO_1_PAIRING_SETUP;
-	peer->info.npk_nik_caching_support = attrs->dev_capa_ext[1] &
+	peer->pairing.pairing_cfg.npk_caching = attrs->dev_capa_ext[1] &
 		NAN_DEV_CAPA_EXT_INFO_1_NPK_NIK_CACHING;
 }
 
@@ -2336,7 +2336,7 @@ bool nan_peer_pairing_supported(struct nan_data *nan, const u8 *addr)
 	if (!peer)
 		return false;
 
-	return peer->info.pairing_support;
+	return peer->pairing.pairing_cfg.pairing_setup;
 }
 
 
@@ -2348,7 +2348,7 @@ bool nan_peer_npk_nik_caching_supported(struct nan_data *nan, const u8 *addr)
 	if (!peer)
 		return false;
 
-	return peer->info.npk_nik_caching_support;
+	return peer->pairing.pairing_cfg.npk_caching;
 }
 
 
diff --git a/src/nan/nan_i.h b/src/nan/nan_i.h
index 25ca5b011b..d0bf37a290 100644
--- a/src/nan/nan_i.h
+++ b/src/nan/nan_i.h
@@ -310,8 +310,6 @@ struct nan_peer_sec_info_entry {
  *	(struct nan_elem_container_entry::list entries)
  * @sec: List of security information entries of the peer
  *	(struct nan_peer_sec_info_entry::list entries)
- * @pairing_support: Indicates whether the peer supports pairing
- * @npk_nik_caching_support: Indicates whether the peer supports NPK/NIK caching
  */
 struct nan_peer_info {
 	struct os_reltime last_seen;
@@ -320,9 +318,6 @@ struct nan_peer_info {
 	struct dl_list dev_capa;
 	struct dl_list element_container;
 	struct dl_list sec;
-
-	bool pairing_support;
-	bool npk_nik_caching_support;
 };
 
 /**
-- 
2.53.0