diff options
| author | taesub.kim <taesub.kim@samsung.com> | 2015-10-06 11:04:26 +0900 |
|---|---|---|
| committer | taesub.kim <taesub.kim@samsung.com> | 2015-10-06 11:04:49 +0900 |
| commit | 811c8790cfc2a5cf3806558be7aecac544037ebb (patch) | |
| tree | 964bc79dfe5a78b468b4d0cadb50c3c9711591e2 /src/network.c | |
| parent | 8b4bc4bc6b4dc5f2a5723421bd7da133647c3ce0 (diff) | |
| download | connman-811c8790cfc2a5cf3806558be7aecac544037ebb.tar.gz connman-811c8790cfc2a5cf3806558be7aecac544037ebb.tar.bz2 connman-811c8790cfc2a5cf3806558be7aecac544037ebb.zip | |
Sync with Tizen 2.4(1.29.36)submit/tizen/20151020.082803accepted/tizen/wearable/20151020.111030accepted/tizen/tv/20151020.111019accepted/tizen/mobile/20151020.111002
Change-Id: I02fc50820cccc66aed702a97a9928981e73b43cf
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
Diffstat (limited to 'src/network.c')
| -rwxr-xr-x | src/network.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network.c b/src/network.c index f928b6af..ad677467 100755 --- a/src/network.c +++ b/src/network.c @@ -1355,7 +1355,8 @@ int connman_network_set_associating(struct connman_network *network, } #if defined TIZEN_EXT - if (associating == FALSE) + if (associating == FALSE && + connman_network_get_bool(network, "WiFi.UseWPS") == FALSE) g_timeout_add_seconds(1, __connman_network_clear_associating_delayed, network); |