Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp11186070ybi; Thu, 25 Jul 2019 11:29:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqzRkF6I+kBhiQtZf5lOCD1K/WyF5V0sM8rpJheZ/L893IYPo5OPQbw3GLRnGbG54lzeyiIp X-Received: by 2002:a17:90a:8c0c:: with SMTP id a12mr93996776pjo.67.1564079361398; Thu, 25 Jul 2019 11:29:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564079361; cv=none; d=google.com; s=arc-20160816; b=LwGhf+lX3GCHOwDMfXk7DX9pOGUJgzz2LukMJvDDi0ZMqtq5o7NfOSsT9Nzs3R/28C qaBD+f295aBdffKrggZhzLQWKLnxVNSu939tkK9OxZhNFTX2oVL3Rrc+UTX8x6jKOCMP j3o2Dpf9zEXkbRsdYLXRd1L2hBcwBvNi70NFBOHQ7kKbbUoo6hI7ZV0uie8FQCacW8Wa 4IUbtT6jJBT7t2gqUVu7t+/ToFSt8gPOKxuhS6gSYQAwwk8QhphMATTZYsCD2v3Jg17I eKJhPi1ovYXbZRLRkxhYbAh8+h3suuMgVPUor7uK7fthEyBp49qbCk0ca/dcIk/VJXvv Spdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=y1K1um/Lb/iVVB6gKd5Db6WwfjD0k7Q1MGEYG14jG+Y=; b=0Xvvib0YWQe9RPQW1nGIzkjnrpU7kcU41YoTwarppz9PBc3BB7J6NPzg3Swm53TBHp gK2WnScWATNMrSLjn5ybpwsOIRAwgfz0w4dZ59TE0PnlaSVMqgA5hVtTuNiswpZ3SsPG B2Z4ekpqcXwCcVLQAeQryTH2SDmU2p+ThBjglheY7Zy0n7v2S7/BLiEYPw+c60ysOzKM Rt5N414uQVhOcU9zda8bUjPUlqvtwXUVfE2SuDZiWxeagG4AzpmGPEhxCq4vtKTiHwHD nlQg340y6ja6znwd1vrHNHb319vxter6f56XC9kC9NSQrLu4ADLxCeX6shPsumbirJa7 PPPQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k43si15667773pje.59.2019.07.25.11.29.00; Thu, 25 Jul 2019 11:29:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725838AbfGYS0P (ORCPT + 99 others); Thu, 25 Jul 2019 14:26:15 -0400 Received: from mga18.intel.com ([134.134.136.126]:32794 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725909AbfGYS0P (ORCPT ); Thu, 25 Jul 2019 14:26:15 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jul 2019 11:26:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,307,1559545200"; d="scan'208";a="172729302" Received: from ingas-nuc1.sea.intel.com ([10.254.183.90]) by orsmga003.jf.intel.com with ESMTP; 25 Jul 2019 11:26:14 -0700 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ] mesh: Fix storage init of Friend and LPN features Date: Thu, 25 Jul 2019 11:26:12 -0700 Message-Id: <20190725182612.23401-1-inga.stotland@intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This fixes a typo in mesh-config-json.c when Friend feature was initialized twice and LPN was not initialized at all. --- mesh/mesh-config-json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c index 75015e607..e3baf5dc6 100644 --- a/mesh/mesh-config-json.c +++ b/mesh/mesh-config-json.c @@ -1191,7 +1191,7 @@ static void parse_features(json_object *jconfig, struct mesh_config_node *node) if (json_object_object_get_ex(jconfig, "lowPower", &jvalue)) { mode = get_mode(jvalue); if (mode <= MESH_MODE_UNSUPPORTED) - node->modes.friend = mode; + node->modes.lpn = mode; } if (json_object_object_get_ex(jconfig, "beacon", &jvalue)) { -- 2.21.0