From 1daefbd49f0b75533c1b0cfc7444ad748064333c Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Mon, 28 Jan 2013 17:44:37 +0200 Subject: [PATCH] technology: Enable/disable individual devices also with rfkill In order to keep ConnMan devices in sync with Bluz 5 adapters, the individual devices need to be enabled/disabled also when unblocking/blocking them with rfkill. Thus enable devices after unblocking and disable devices before blocking with rfkill. --- src/technology.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/technology.c b/src/technology.c index bc02bec..799e253 100644 --- a/src/technology.c +++ b/src/technology.c @@ -598,6 +598,9 @@ static int technology_affect_devices(struct connman_technology *technology, static int technology_enable(struct connman_technology *technology) { + int err = 0; + int err_dev; + DBG("technology %p enable", technology); __sync_synchronize(); @@ -608,13 +611,20 @@ static int technology_enable(struct connman_technology *technology) return -EBUSY; if (technology->rfkill_driven == TRUE) - return __connman_rfkill_block(technology->type, FALSE); + err = __connman_rfkill_block(technology->type, FALSE); + + err_dev = technology_affect_devices(technology, TRUE); - return technology_affect_devices(technology, TRUE); + if (technology->rfkill_driven == FALSE) + err = err_dev; + + return err; } static int technology_disable(struct connman_technology *technology) { + int err; + DBG("technology %p disable", technology); __sync_synchronize(); @@ -627,10 +637,12 @@ static int technology_disable(struct connman_technology *technology) if (technology->tethering == TRUE) set_tethering(technology, FALSE); + err = technology_affect_devices(technology, FALSE); + if (technology->rfkill_driven == TRUE) - return __connman_rfkill_block(technology->type, TRUE); + err = __connman_rfkill_block(technology->type, TRUE); - return technology_affect_devices(technology, FALSE); + return err; } static DBusMessage *set_powered(struct connman_technology *technology, -- 2.7.4