diff mbox series

[BlueZ] mesh: Remove unused/redundant functions

Message ID 20200605213143.194808-1-inga.stotland@intel.com
State New
Headers show
Series [BlueZ] mesh: Remove unused/redundant functions | expand

Commit Message

Inga Stotland June 5, 2020, 9:31 p.m. UTC 
This removes mesh_net_provisioner_mode_set (unused) and
mesh_net_provisioner_mode_get (duplicates node_is_provisioner)
---
 mesh/model.c |  2 +-
 mesh/net.c   | 10 ----------
 mesh/net.h   |  2 --
 3 files changed, 1 insertion(+), 13 deletions(-)
diff mbox series

Patch

diff --git a/mesh/model.c b/mesh/model.c
index ec79a69b8..f2dfb2644 100644
--- a/mesh/model.c
+++ b/mesh/model.c
@@ -907,7 +907,7 @@  bool mesh_model_rx(struct mesh_node *node, bool szmict, uint32_t seq0,
 	 * The packet needs to be decoded by the correct key which
 	 * is hinted by key_aid, but is not necessarily definitive
 	 */
-	if (key_aid == APP_AID_DEV || mesh_net_provisioner_mode_get(net))
+	if (key_aid == APP_AID_DEV || node_is_provisioner(node))
 		decrypt_idx = dev_packet_decrypt(node, data, size, szmict, src,
 						dst, key_aid, seq0, iv_index,
 						clear_text);
diff --git a/mesh/net.c b/mesh/net.c
index 07813eec4..c12dd6541 100644
--- a/mesh/net.c
+++ b/mesh/net.c
@@ -3362,16 +3362,6 @@  void mesh_net_set_iv_index(struct mesh_net *net, uint32_t index, bool update)
 	net->iv_update = update;
 }
 
-void mesh_net_provisioner_mode_set(struct mesh_net *net, bool mode)
-{
-	net->provisioner = mode;
-}
-
-bool mesh_net_provisioner_mode_get(struct mesh_net *net)
-{
-	return net->provisioner;
-}
-
 uint16_t mesh_net_get_primary_idx(struct mesh_net *net)
 {
 	struct mesh_subnet *subnet;
diff --git a/mesh/net.h b/mesh/net.h
index 84e7c1545..f7fe3f150 100644
--- a/mesh/net.h
+++ b/mesh/net.h
@@ -335,8 +335,6 @@  void mesh_net_send_seg(struct mesh_net *net, uint32_t key_id,
 struct mesh_net_heartbeat *mesh_net_heartbeat_get(struct mesh_net *net);
 void mesh_net_heartbeat_init(struct mesh_net *net);
 void mesh_net_heartbeat_send(struct mesh_net *net);
-void mesh_net_provisioner_mode_set(struct mesh_net *net, bool mode);
-bool mesh_net_provisioner_mode_get(struct mesh_net *net);
 bool mesh_net_key_list_get(struct mesh_net *net, uint8_t *buf, uint16_t *count);
 uint16_t mesh_net_get_primary_idx(struct mesh_net *net);
 uint32_t mesh_net_friend_timeout(struct mesh_net *net, uint16_t addr);