2012-07-06 18:47:28

by Vinicius Costa Gomes

Subject: [PATCH BlueZ] mgmtops: Fix calling btd_adapter_start() for an off adapter

When the adapter mode is off and the controller is down, we should
not consider that the adapter is powered up.
---
plugins/mgmtops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
index c060ada..4c86389 100644
--- a/plugins/mgmtops.c
+++ b/plugins/mgmtops.c
@@ -1074,7 +1074,7 @@ static void read_info_complete(int sk, uint16_t index, void *buf, size_t len)

if (mode != MODE_OFF && !mgmt_powered(info->current_settings))
mgmt_set_powered(index, TRUE);
- else {
+ else if (mode != MODE_OFF) {
get_connections(sk, index);
btd_adapter_start(adapter);
}
--
1.7.10.4

2012-07-06 20:24:21

by Vinicius Costa Gomes

Subject: Re: [PATCH BlueZ] mgmtops: Fix calling btd_adapter_start() for an off adapter

Hi Johan,

On 21:04 Fri 06 Jul, Johan Hedberg wrote:
> Hi Vinicius,
>
> On Fri, Jul 06, 2012, Vinicius Costa Gomes wrote:
> > When the adapter mode is off and the controller is down, we should
> > not consider that the adapter is powered up.
> > ---
> > plugins/mgmtops.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
> > index c060ada..4c86389 100644
> > --- a/plugins/mgmtops.c
> > +++ b/plugins/mgmtops.c
> > @@ -1074,7 +1074,7 @@ static void read_info_complete(int sk, uint16_t index, void *buf, size_t len)
> >
> > if (mode != MODE_OFF && !mgmt_powered(info->current_settings))
> > mgmt_set_powered(index, TRUE);
> > - else {
> > + else if (mode != MODE_OFF) {
> > get_connections(sk, index);
> > btd_adapter_start(adapter);
> > }
>
> Thanks for catching this, but I think the following would be even more
> clear:
>
> if (mode != MODE_OFF) {
> if (mgmt_powered(info->current_settings)) {
> get_connections(sk, index);
> btd_adapter_start(adapter);
> } else
> mgmt_set_powered(index, TRUE);
> }
>
> Could you please resend a patch with this logic (assuming you agree)?

Yeah, I agree. Patch coming in a few moments.

>
> Johan


Cheers,
--
Vinicius

2012-07-06 20:04:12

by Johan Hedberg

Subject: Re: [PATCH BlueZ] mgmtops: Fix calling btd_adapter_start() for an off adapter

Hi Vinicius,

On Fri, Jul 06, 2012, Vinicius Costa Gomes wrote:
> When the adapter mode is off and the controller is down, we should
> not consider that the adapter is powered up.
> ---
> plugins/mgmtops.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
> index c060ada..4c86389 100644
> --- a/plugins/mgmtops.c
> +++ b/plugins/mgmtops.c
> @@ -1074,7 +1074,7 @@ static void read_info_complete(int sk, uint16_t index, void *buf, size_t len)
>
> if (mode != MODE_OFF && !mgmt_powered(info->current_settings))
> mgmt_set_powered(index, TRUE);
> - else {
> + else if (mode != MODE_OFF) {
> get_connections(sk, index);
> btd_adapter_start(adapter);
> }

Thanks for catching this, but I think the following would be even more
clear:

if (mode != MODE_OFF) {
if (mgmt_powered(info->current_settings)) {
get_connections(sk, index);
btd_adapter_start(adapter);
} else
mgmt_set_powered(index, TRUE);
}

Could you please resend a patch with this logic (assuming you agree)?

Johan