diff options
| author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-12-12 11:39:00 +0200 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-12-12 13:38:17 +0200 |
| commit | 118174d9b423a5ee45411cb59c96be50f67d0621 (patch) | |
| tree | b31836bb445dde21cd01214b40732662b468abbd /src/technology.c | |
| parent | d7350260f366ea89155055e0a59e7362aab09fdc (diff) | |
| download | connman-118174d9b423a5ee45411cb59c96be50f67d0621.tar.gz connman-118174d9b423a5ee45411cb59c96be50f67d0621.tar.bz2 connman-118174d9b423a5ee45411cb59c96be50f67d0621.zip | |
technology: Soft block on offline mode or disabled technology
When adding an rfkill device which is unblocked, soft block it immediately
if offline mode is enabled or the technology (enable_persistent) is
disabled.
Fixes BMC#25858
Diffstat (limited to 'src/technology.c')
| -rw-r--r-- | src/technology.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/technology.c b/src/technology.c index 1ff8fb72..b0346a82 100644 --- a/src/technology.c +++ b/src/technology.c @@ -1454,8 +1454,8 @@ done: technology->enable_persistent == TRUE) return __connman_rfkill_block(type, FALSE); else if (technology->softblocked == FALSE && - global_offlinemode == TRUE && - technology->enable_persistent == FALSE) + (global_offlinemode == TRUE || + technology->enable_persistent == FALSE)) return __connman_rfkill_block(type, TRUE); return 0; |