2011-03-17 13:20:39

by Radoslaw Jablonski

Subject: [PATCH] Set correct adapter state in cancel_resolve_name

Previously resetting STATE_RESOLVNAME for adapter was missing.
This was causing problems with discovering devices when discovery
was quickly turned off/on during resolving name.
---
src/adapter.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 8c368fe..cc4f43e 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -260,6 +260,7 @@ static int pending_remote_name_cancel(struct btd_adapter *adapter)
if (!dev) /* no pending request */
return -ENODATA;

+ adapter->state &= ~STATE_RESOLVNAME;
err = adapter_ops->cancel_resolve_name(adapter->dev_id, &dev->bdaddr);
if (err < 0)
error("Remote name cancel failed: %s(%d)",
--
1.7.0.4

2011-03-18 09:24:51

by Johan Hedberg

Subject: Re: [PATCH] Set correct adapter state in cancel_resolve_name

Hi Radek,

On Thu, Mar 17, 2011, Radoslaw Jablonski wrote:
> Previously resetting STATE_RESOLVNAME for adapter was missing.
> This was causing problems with discovering devices when discovery
> was quickly turned off/on during resolving name.
> ---
> src/adapter.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)

Pushed upstream. Thanks.

Johan