summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2013-07-25 13:31:28 (GMT)
committerZhang zhengguang <zhengguang.zhang@intel.com>2013-08-15 01:14:25 (GMT)
commitde9a417f3ad6daf12eee7088570bc9f478e0f4cc (patch)
tree6292b220d1d55168b4ec9ba2ffcf534525736bdf
parentbb057ae7cf1cb028af07ee5a17127e86bcf4a12c (diff)
downloadconnman-de9a417f3ad6daf12eee7088570bc9f478e0f4cc.zip
connman-de9a417f3ad6daf12eee7088570bc9f478e0f4cc.tar.gz
connman-de9a417f3ad6daf12eee7088570bc9f478e0f4cc.tar.bz2
technology: Check hardblock when returning from offline moderefs/changes/77/8277/3
If we are hardblocked, then we must not enable the technology when we are returning from offline mode. Upstream commit id:10ce0a87d558b77bed2961c2933918f46c1a0dee
-rw-r--r--src/technology.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/technology.c b/src/technology.c
index 8addf1c..77601b4 100644
--- a/src/technology.c
+++ b/src/technology.c
@@ -1531,6 +1531,9 @@ int __connman_technology_set_offlinemode(connman_bool_t offlinemode)
if (offlinemode)
err = technology_disable(technology);
else {
+ if (technology->hardblocked)
+ continue;
+
if (technology->enable_persistent) {
err = technology_enable(technology);
enabled_tech_count++;