From: "Gix, Brian" <brian.gix@intel.com>
To: "linux-bluetooth@vger.kernel.org"
<linux-bluetooth@vger.kernel.org>,
"Stotland, Inga" <inga.stotland@intel.com>
Subject: Re: [PATCH BlueZ] mesh: Fix clean up after AddNode method
Date: Tue, 12 Nov 2019 17:56:15 +0000 [thread overview]
Message-ID: <8158a78610ff3ecae0a5a0b86e3c0bca58018f0d.camel@intel.com> (raw)
In-Reply-To: <20191109000700.5428-1-inga.stotland@intel.com>
Applied, Thanks
On Fri, 2019-11-08 at 16:07 -0800, Inga Stotland wrote:
> This fixes the cleanup routine that is called after AddNode method
> on org.bluez.mesh.Manager1 interface is complete: do not remove
> the agent associated with the Provisioner (owner of Manager interface).
> ---
> mesh/manager.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/mesh/manager.c b/mesh/manager.c
> index b39ea6ed7..0b11b4541 100644
> --- a/mesh/manager.c
> +++ b/mesh/manager.c
> @@ -80,8 +80,6 @@ static void free_pending_add_call()
> l_dbus_remove_watch(dbus_get_bus(),
> add_pending->disc_watch);
>
> - mesh_agent_remove(add_pending->agent);
> -
> l_free(add_pending);
> add_pending = NULL;
> }
> @@ -246,7 +244,7 @@ static struct l_dbus_message *add_node_call(struct l_dbus *dbus,
> add_pending = l_new(struct add_data, 1);
> memcpy(add_pending->uuid, uuid, 16);
> add_pending->node = node;
> - add_pending->agent = node_get_agent(node);;
> + add_pending->agent = node_get_agent(node);
>
> if (!node_is_provisioner(node) || (add_pending->agent == NULL)) {
> l_info("Provisioner: %d", node_is_provisioner(node));
prev parent reply other threads:[~2019-11-12 17:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 0:07 [PATCH BlueZ] mesh: Fix clean up after AddNode method Inga Stotland
2019-11-12 17:56 ` Gix, Brian [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8158a78610ff3ecae0a5a0b86e3c0bca58018f0d.camel@intel.com \
--to=brian.gix@intel.com \
--cc=inga.stotland@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).