[PATCH 15/19] P2PS: delete p2ps_svc_found from p2p_data struct

Ilan Peer ilan.peer
Wed Jun 10 01:43:45 PDT 2015


From: Max Stepanov <Max.Stepanov at intel.com>

This variable is used locally only in p2p_reply_probe function. The value of
this variable is valid only in the context of the single probe request
message handling and doesn't make too much sense in p2p context.

Signed-off-by: Max Stepanov <Max.Stepanov at intel.com>
Reviewed-by: Ilan Peer <ilan.peer at intel.com>
---
 src/p2p/p2p.c   | 9 ++++-----
 src/p2p/p2p_i.h | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 12a8b96..54fa36b 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -2307,17 +2307,16 @@ p2p_reply_probe(struct p2p_data *p2p, const u8 *addr, const u8 *dst,
 		return P2P_PREQ_NOT_P2P;
 	}
 
-	p2p->p2ps_svc_found = 0;
-
 	if (msg.service_hash && msg.service_hash_count) {
 		const u8 *hash = msg.service_hash;
 		u8 *dest = p2p->query_hash;
 		u8 i;
+		int p2ps_svc_found = 0;
 
 		p2p->query_count = 0;
 		for (i = 0; i < msg.service_hash_count; i++) {
 			if (p2p_service_find_asp(p2p, hash)) {
-				p2p->p2ps_svc_found = 1;
+				p2ps_svc_found = 1;
 
 				if (!os_memcmp(hash, p2p->wild_card_hash,
 					       P2PS_HASH_LEN)) {
@@ -2344,10 +2343,10 @@ p2p_reply_probe(struct p2p_data *p2p, const u8 *addr, const u8 *dst,
 			hash += P2PS_HASH_LEN;
 		}
 
-		p2p_dbg(p2p, "ASP adv found: %d", p2p->p2ps_svc_found);
+		p2p_dbg(p2p, "ASP adv found: %d", p2ps_svc_found);
 
 		/* Probed hash unknown */
-		if (!p2p->p2ps_svc_found) {
+		if (!p2ps_svc_found) {
 			p2p_parse_free(&msg);
 			return P2P_PREQ_NOT_PROCESSED;
 		}
diff --git a/src/p2p/p2p_i.h b/src/p2p/p2p_i.h
index a637e69..5454d32 100644
--- a/src/p2p/p2p_i.h
+++ b/src/p2p/p2p_i.h
@@ -518,7 +518,6 @@ struct p2p_data {
 	u8 query_count;
 	u8 p2ps_seek;
 	u8 p2ps_seek_count;
-	u8 p2ps_svc_found;
 
 #ifdef CONFIG_WIFI_DISPLAY
 	struct wpabuf *wfd_ie_beacon;
-- 
1.9.1




More information about the Hostap mailing list