Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D42E8C282DD for ; Thu, 23 May 2019 16:14:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B182621773 for ; Thu, 23 May 2019 16:14:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731263AbfEWQOC (ORCPT ); Thu, 23 May 2019 12:14:02 -0400 Received: from mga07.intel.com ([134.134.136.100]:39551 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730782AbfEWQOB (ORCPT ); Thu, 23 May 2019 12:14:01 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 May 2019 09:14:00 -0700 X-ExtLoop1: 1 Received: from bgix-dell-lap.sea.intel.com ([10.255.78.4]) by orsmga002.jf.intel.com with ESMTP; 23 May 2019 09:14:00 -0700 From: Brian Gix To: linux-bluetooth@vger.kernel.org Cc: inga.stotland@intel.com, brian.gix@intel.com Subject: [PATCH BlueZ v3 2/6] mesh: Centralize definition of PRIMARY_NET_IDX Date: Thu, 23 May 2019 09:13:25 -0700 Message-Id: <20190523161329.13017-3-brian.gix@intel.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20190523161329.13017-1-brian.gix@intel.com> References: <20190523161329.13017-1-brian.gix@intel.com> Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org --- mesh/mesh-defs.h | 1 + mesh/node.c | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mesh/mesh-defs.h b/mesh/mesh-defs.h index aba0d318f..1a199f156 100644 --- a/mesh/mesh-defs.h +++ b/mesh/mesh-defs.h @@ -74,6 +74,7 @@ #define VENDOR_ID_MASK 0xffff0000 +#define PRIMARY_NET_IDX 0x0000 #define MAX_KEY_IDX 0x0fff #define MAX_MODEL_COUNT 0xff #define MAX_ELE_COUNT 0xff diff --git a/mesh/node.c b/mesh/node.c index 394f5bfa9..e99858623 100644 --- a/mesh/node.c +++ b/mesh/node.c @@ -51,7 +51,6 @@ /* Default values for a new locally created node */ #define DEFAULT_NEW_UNICAST 0x0001 #define DEFAULT_IV_INDEX 0x0000 -#define DEFAULT_PRIMARY_NET_INDEX 0x0000 /* Default element location: unknown */ #define DEFAULT_LOCATION 0x0000 @@ -1564,21 +1563,20 @@ static void get_managed_objects_cb(struct l_dbus_message *msg, void *user_data) /* Generate device and primary network keys */ l_getrandom(dev_key, sizeof(dev_key)); l_getrandom(net_key.old_key, sizeof(net_key.old_key)); - net_key.net_idx = DEFAULT_PRIMARY_NET_INDEX; - net_key.phase = 0; + net_key.net_idx = PRIMARY_NET_IDX; + net_key.phase = KEY_REFRESH_PHASE_NONE; if (!add_local_node(node, DEFAULT_NEW_UNICAST, false, false, DEFAULT_IV_INDEX, dev_key, - DEFAULT_PRIMARY_NET_INDEX, - net_key.old_key)) + PRIMARY_NET_IDX, + net_key.old_key)) goto fail; if (!keyring_put_remote_dev_key(node, DEFAULT_NEW_UNICAST, num_ele, dev_key)) goto fail; - if (!keyring_put_net_key(node, DEFAULT_PRIMARY_NET_INDEX, - &net_key)) + if (!keyring_put_net_key(node, PRIMARY_NET_IDX, &net_key)) goto fail; cb(req->user_data, MESH_ERROR_NONE, node); -- 2.14.5