Bluetooth: Mesh: Rename reset_link() to reset_adv_link()

Johan Hedberg · nashif · commit de5083445503 · 2019-07-02T16:55:33.000-04:00
This is a PB-ADV specific internal helper, so rename it appropriately
to avoid any confusion.

Signed-off-by: Johan Hedberg &lt;johan.hedberg@intel.com&gt;
diff --git a/subsys/bluetooth/host/mesh/prov.c b/subsys/bluetooth/host/mesh/prov.c
@@ -269,7 +269,7 @@ static void prov_clear_tx(void)
 	free_segments();
 }
 
-static void reset_link(void)
+static void reset_adv_link(void)
 {
 	prov_clear_tx();
 
@@ -1150,7 +1150,7 @@ static void prov_retransmit(struct k_work *work)
 
 	if (k_uptime_get() - link.tx.start > TRANSACTION_TIMEOUT) {
 		BT_WARN("Giving up transaction");
-		reset_link();
+		reset_adv_link();
 		return;
 	}
 
@@ -1224,7 +1224,7 @@ static void link_close(struct prov_rx *rx, struct net_buf_simple *buf)
 {
 	BT_DBG("len %u", buf->len);
 
-	reset_link();
+	reset_adv_link();
 }
 
 static void gen_prov_ctl(struct prov_rx *rx, struct net_buf_simple *buf)

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ static void prov_clear_tx(void)`
`269`	`269`	`free_segments();`
`270`	`270`	`}`
`271`	`271`
`272`		`-static void reset_link(void)`
	`272`	`+static void reset_adv_link(void)`
`273`	`273`	`{`
`274`	`274`	`prov_clear_tx();`
`275`	`275`
`@@ -1150,7 +1150,7 @@ static void prov_retransmit(struct k_work *work)`
`1150`	`1150`
`1151`	`1151`	`if (k_uptime_get() - link.tx.start > TRANSACTION_TIMEOUT) {`
`1152`	`1152`	`BT_WARN("Giving up transaction");`
`1153`		`- reset_link();`
	`1153`	`+ reset_adv_link();`
`1154`	`1154`	`return;`
`1155`	`1155`	`}`
`1156`	`1156`
`@@ -1224,7 +1224,7 @@ static void link_close(struct prov_rx rx, struct net_buf_simple buf)`
`1224`	`1224`	`{`
`1225`	`1225`	`BT_DBG("len %u", buf->len);`
`1226`	`1226`
`1227`		`- reset_link();`
	`1227`	`+ reset_adv_link();`
`1228`	`1228`	`}`
`1229`	`1229`
`1230`	`1230`	`static void gen_prov_ctl(struct prov_rx rx, struct net_buf_simple buf)`