From:   "Gix, Brian" <brian.gix@intel.com>
To:     "Stotland, Inga" <inga.stotland@intel.com>,
        "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>
CC:     "johan.hedberg@gmail.com" <johan.hedberg@gmail.com>,
        "luiz.dentz@gmail.com" <luiz.dentz@gmail.com>
Subject: RE: [PATCH BlueZ] mesh: Fix adding model app key binding
Thread-Topic: [PATCH BlueZ] mesh: Fix adding model app key binding
Thread-Index: AQHU4FakGgflVz/WNUOEDMo7ikGBU6YX2n7w
Date:   Fri, 22 Mar 2019 16:38:49 +0000
Message-ID: <DEBB0CAA2616974FAE35E4B560B9A4376CAD9F61@ORSMSX103.amr.corp.intel.com>
References: <20190322022610.5047-1-inga.stotland@intel.com>
In-Reply-To: <20190322022610.5047-1-inga.stotland@intel.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

patch applied

> -----Original Message-----
> From: Stotland, Inga
> Subject: [PATCH BlueZ] mesh: Fix adding model app key binding
> 
> This fixes the situation when a new app key binding is being added to a
> model and the list of bindings does not exist yet.
> If the list does not exist, it is created and the binding is added to it.
> 
> Also, remove unnecessary memory alloc check when model subscriptions are
> added.
> ---
>  mesh/model.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/mesh/model.c b/mesh/model.c index 80c30edba..a632d80e1
> 100644
> --- a/mesh/model.c
> +++ b/mesh/model.c
> @@ -522,6 +522,9 @@ static void model_unbind_idx(struct mesh_node
> *node, struct mesh_model *mod,  static void model_bind_idx(struct
> mesh_node *node, struct mesh_model *mod,
>  								uint16_t idx)
>  {
> +	if (!mod->bindings)
> +		mod->bindings = l_queue_new();
> +
>  	l_queue_push_tail(mod->bindings, L_UINT_TO_PTR(idx));
> 
>  	l_debug("Add %4.4x to model %8.8x", idx, mod->id); @@ -689,8
> +692,6 @@ static int add_sub(struct mesh_net *net, struct mesh_model
> *mod,
> 
>  	if (!mod->subs)
>  		mod->subs = l_queue_new();
> -	if (!mod->subs)
> -		return MESH_STATUS_STORAGE_FAIL;
> 
>  	if (l_queue_find(mod->subs, simple_match, L_UINT_TO_PTR(grp)))
>  		/* Group already exists */
> --
> 2.17.2