diff options
author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2013-07-15 17:13:13 +0300 |
---|---|---|
committer | Zhang zhengguang <zhengguang.zhang@intel.com> | 2013-08-09 10:33:15 +0800 |
commit | f19f2485b1c7e8b585472d3dfc60f791b45c3b3b (patch) | |
tree | 1320bc68a9fad37767fa3d8104dedaf08914e50e | |
parent | 796decd97c3eb4563bc22cd0eb02db3c4d7fa400 (diff) | |
download | connman-f19f2485b1c7e8b585472d3dfc60f791b45c3b3b.tar.gz connman-f19f2485b1c7e8b585472d3dfc60f791b45c3b3b.tar.bz2 connman-f19f2485b1c7e8b585472d3dfc60f791b45c3b3b.zip |
Upstream/technology: Check offline mode separately when rfkill device is added
Upstream commit id: c3c35b8842b24546b0424ca1d83ca919ffd2427c
-rw-r--r-- | src/technology.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/technology.c b/src/technology.c index bfed6f91..d8f23c10 100644 --- a/src/technology.c +++ b/src/technology.c @@ -1674,17 +1674,18 @@ done: softblock, hardblock, TRUE) == TRUE) return 0; + if (global_offlinemode) + return 0; + /* * Depending on softblocked state we unblock/block according to * offlinemode and persistente state. */ if (technology->softblocked == TRUE && - global_offlinemode == FALSE && technology->enable_persistent == TRUE) return __connman_rfkill_block(type, FALSE); else if (technology->softblocked == FALSE && - (global_offlinemode == TRUE || - technology->enable_persistent == FALSE)) + technology->enable_persistent == FALSE) return __connman_rfkill_block(type, TRUE); return 0; |