technology: Recompute hardblocked state on rfkill remove event

This fixes the case of cascading rfkill switches: if enabled, hard rfkilling
such technology might generate contradictory events.

1 - first all switches are hardblocked
2 - then one of these switch (usually: device's switch) gets fully unblocked
3 - then this same switch gets removed

Step 2 is in contradiction with step 1, so we need to care about such switch
getting removed by recomputing the hardblocked state.

diff --git a/src/technology.c b/src/technology.c
index 44eeb136c1ee76fd1d54ea618e21adaa465bde75..976964a787ee1638df64d2154f8d9e49239d2148 100644 (file)
--- a/src/technology.c
+++ b/src/technology.c
@@ -1346,6 +1346,10 @@ static connman_bool_t technology_apply_rfkill_change(struct connman_technology *
        gboolean apply = TRUE;
        GList *start, *list;
 
+       DBG("technology %p --> %d/%d vs %d/%d",
+                       technology, softblock, hardblock,
+                       technology->softblocked, technology->hardblocked);
+
        if (technology->hardblocked == hardblock)
                goto softblock_change;
 
@@ -1519,6 +1523,9 @@ int __connman_technology_remove_rfkill(unsigned int index,
        if (technology == NULL)
                return -ENXIO;
 
+       technology_apply_rfkill_change(technology,
+                       technology->softblocked, !technology->hardblocked);
+
        technology_put(technology);
 
        return 0;