[PATCH] P2P2: Remove redundant enable_pairing_verification flag

[Andrei Otcheretianski <andrei.otcheretianski@xxxxxxxxx>]

This is a duplicate of enable_pairing_cache flag. Remove it.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@xxxxxxxxx>
---
 src/p2p/p2p.c       | 1 -
 src/p2p/p2p.h       | 5 -----
 src/p2p/p2p_build.c | 3 +--
 src/p2p/p2p_pd.c    | 1 -
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index e109e320ca..703fe92447 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -5890,7 +5890,6 @@ struct wpabuf * p2p_usd_elems(struct p2p_data *p2p)
 	if (p2p->pairing_info &&
 	    p2p->cfg->pairing_config.pairing_capable &&
 	    p2p->cfg->pairing_config.enable_pairing_cache &&
-	    p2p->cfg->pairing_config.enable_pairing_verification &&
 	    p2p_derive_nonce_tag(p2p) == 0)
 		p2p_buf_add_dira(buf, p2p);
 
diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 56b80d89eb..cdd926fd53 100644
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -349,11 +349,6 @@ struct p2p_pairing_config {
 	 */
 	bool enable_pairing_cache;
 
-	/**
-	 * Enable P2P pairing verification with cached NIK/NPK
-	 */
-	bool enable_pairing_verification;
-
 	/**
 	 * P2P bootstrapping methods supported
 	 */
diff --git a/src/p2p/p2p_build.c b/src/p2p/p2p_build.c
index ddadd34bc5..44809c2159 100644
--- a/src/p2p/p2p_build.c
+++ b/src/p2p/p2p_build.c
@@ -806,8 +806,7 @@ void p2p_buf_add_dira(struct wpabuf *buf, struct p2p_data *p2p)
 	struct p2p_id_key *dev_ik;
 
 	if (!p2p->cfg->pairing_config.pairing_capable ||
-	    !p2p->cfg->pairing_config.enable_pairing_cache ||
-	    !p2p->cfg->pairing_config.enable_pairing_verification)
+	    !p2p->cfg->pairing_config.enable_pairing_cache)
 		return;
 
 	dev_ik = &p2p->pairing_info->dev_ik;
diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
index 7581fbfdef..f2d5ee4884 100644
--- a/src/p2p/p2p_pd.c
+++ b/src/p2p/p2p_pd.c
@@ -703,7 +703,6 @@ void p2p_process_pcea(struct p2p_data *p2p, struct p2p_message *msg,
 
 	if (dev->info.pcea_cap_info & P2P_PCEA_PMK_CACHING) {
 		dev->info.pairing_config.enable_pairing_cache = true;
-		dev->info.pairing_config.enable_pairing_verification = true;
 	}
 }
 
-- 
2.43.0


_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap