Skip to contentSkip to conversation

mesh: Cleanup PB-ADV transport on Prov Close

PATCH In review Brian Gix 1 participant 2 messages Jan 14, 2019 – Jan 16, 2019 Bluetooth drivers

lore
Share & tools
lore

Brian Gix

author
#0 lore raw

PATCH 1/1 mesh: Cleanup PB-ADV transport on Prov Close

PB-ADV always used for provisioning, so must always be cleaned up.

---
 mesh/prov-acceptor.c  | 5 +----
 mesh/prov-initiator.c | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)
mesh/prov-acceptor.c +1 -4
index d983991d4..3d4d93ba4 100644
@@ -126,10 +126,7 @@ static void acceptor_free(void)
 	mesh_send_cancel(bec_filter, sizeof(bec_filter));
 	mesh_send_cancel(&pkt_filter, sizeof(pkt_filter));
 
-	if (prov->trans_tx) {
-		if (prov->transport == PB_ADV)
-			pb_adv_unreg(prov->trans_data);
-	}
+	pb_adv_unreg(prov);
 
 	l_free(prov);
 	prov = NULL;
mesh/prov-initiator.c +2 -0
index 669cf340d..d915f2aaf 100644
@@ -122,6 +122,8 @@ static void initiator_free(void)
 
 	mesh_send_cancel(&pkt_filter, sizeof(pkt_filter));
 
+	pb_adv_unreg(prov);
+
 	l_free(prov);
 	prov = NULL;
 }
Signature · 1 line
2.20.1
author
#1 lore raw

Applied upstream

Quoted 45 lines

-----Original Message-----
From: Gix, Brian
Sent: Monday, January 14, 2019 3:05 PM
To: [email protected]
Cc: Stotland, Inga <[email protected]>; Gix, Brian <[email protected]>
Subject: [PATCH BlueZ] mesh: Cleanup PB-ADV transport on Prov Close

PB-ADV always used for provisioning, so must always be cleaned up.

---
 mesh/prov-acceptor.c  | 5 +----
 mesh/prov-initiator.c | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)
mesh/prov-acceptor.c index renamed from mesh/prov-acceptor.c +0 -0

d983991d4..3d4d93ba4 100644

mesh/prov-acceptor.c +1 -4
@@ -126,10 +126,7 @@ static void acceptor_free(void)
 	mesh_send_cancel(bec_filter, sizeof(bec_filter));
 	mesh_send_cancel(&pkt_filter, sizeof(pkt_filter));
 
-	if (prov->trans_tx) {
-		if (prov->transport == PB_ADV)
-			pb_adv_unreg(prov->trans_data);
-	}
+	pb_adv_unreg(prov);
 
 	l_free(prov);
 	prov = NULL;
mesh/prov-initiator.c index renamed from mesh/prov-initiator.c +0 -0

669cf340d..d915f2aaf 100644

mesh/prov-initiator.c +2 -1
@@ -122,6 +122,8 @@ static void initiator_free(void)
 
 	mesh_send_cancel(&pkt_filter, sizeof(pkt_filter));
 
+	pb_adv_unreg(prov);
+
 	l_free(prov);
 	prov = NULL;
 }
--

2.20.1