diff options
| author | Inga Stotland <inga.stotland@intel.com> | 2020-01-09 17:41:44 -0800 |
|---|---|---|
| committer | Brian Gix <brian.gix@intel.com> | 2020-01-14 06:32:23 -0800 |
| commit | 6baade2306503ffcabb8388faa7b9ef5bd2250d3 (patch) | |
| tree | f06c50f5618e51bb8396c576df1448971ccb485e /mesh/appkey.c | |
| parent | 8ce47e71757fc90d13ff9e1e7b189ff751b3ac20 (diff) | |
| download | bluez-6baade2306503ffcabb8388faa7b9ef5bd2250d3.tar.gz | |
mesh: Fix logic in AppKey deletion
When deleting an AppKey from a node, call mesh_config_app_key_del()
only from appkey level (i.e., keep it contained in appkey.c and
remove the duplicate call in node.c)
Also, simplify the node_app_key_delete() argument list.
Diffstat (limited to 'mesh/appkey.c')
| -rw-r--r-- | mesh/appkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesh/appkey.c b/mesh/appkey.c index e96d5228a..3a1fd8a54 100644 --- a/mesh/appkey.c +++ b/mesh/appkey.c @@ -419,13 +419,13 @@ int appkey_key_delete(struct mesh_net *net, uint16_t net_idx, if (key->net_idx != net_idx) return MESH_STATUS_INVALID_NETKEY; - node_app_key_delete(net, mesh_net_get_address(net), net_idx, app_idx); + node = mesh_net_node_get(net); + + node_app_key_delete(node, net_idx, app_idx); l_queue_remove(app_keys, key); appkey_key_free(key); - node = mesh_net_node_get(net); - if (!mesh_config_app_key_del(node_config_get(node), net_idx, app_idx)) return MESH_STATUS_STORAGE_FAIL; |