mesh: Cleanup PB-ADV transport on Prov Close

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

Change-Id: I37bc5f68e032b32942b0e909d3836d260a5c2f1e
Signed-off-by: Anupam Roy <anupam.r@samsung.com>

diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
index d983991..3d4d93b 100644 (file)
--- a/mesh/prov-acceptor.c
+++ b/mesh/prov-acceptor.c
@@ -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;

diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
index 669cf34..d915f2a 100644 (file)
--- a/mesh/prov-initiator.c
+++ b/mesh/prov-initiator.c
@@ -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;
 }