2020-04-01 10:25:45

by Michał Lowas-Rzechonek

[permalink] [raw]
Subject: [PATCH BlueZ v2 2/6] mesh: Remove unused 'server' argument

---
mesh/manager.c | 2 +-
mesh/prov-initiator.c | 1 -
mesh/provision.h | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/mesh/manager.c b/mesh/manager.c
index 0909c7e16..a4c2f2d41 100644
--- a/mesh/manager.c
+++ b/mesh/manager.c
@@ -256,7 +256,7 @@ static struct l_dbus_message *add_node_call(struct l_dbus *dbus,
}


- if (!initiator_start(PB_ADV, uuid, 99, 0, 60, add_pending->agent,
+ if (!initiator_start(PB_ADV, uuid, 99, 60, add_pending->agent,
add_data_get, add_cmplt, node, add_pending)) {
reply = dbus_error(msg, MESH_ERROR_FAILED,
"Failed to start provisioning initiator");
diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
index 7a767cfb3..d5bae114a 100644
--- a/mesh/prov-initiator.c
+++ b/mesh/prov-initiator.c
@@ -817,7 +817,6 @@ static void int_prov_ack(void *user_data, uint8_t msg_num)
bool initiator_start(enum trans_type transport,
uint8_t uuid[16],
uint16_t max_ele,
- uint16_t server, /* Only valid for PB-Remote */
uint32_t timeout, /* in seconds from mesh.conf */
struct mesh_agent *agent,
mesh_prov_initiator_data_req_func_t get_prov_data,
diff --git a/mesh/provision.h b/mesh/provision.h
index 755d848a0..d6f6e0ab0 100644
--- a/mesh/provision.h
+++ b/mesh/provision.h
@@ -118,7 +118,6 @@ void acceptor_cancel(void *user_data);
bool initiator_start(enum trans_type transport,
uint8_t uuid[16],
uint16_t max_ele,
- uint16_t server, /* Only valid for PB-Remote */
uint32_t timeout, /* in seconds from mesh.conf */
struct mesh_agent *agent,
mesh_prov_initiator_data_req_func_t get_prov_data,
--
2.20.1