merge with master

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 9d1ebfe..047d637 100644 (file)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -1,5 +1,5 @@
 Name:           connman
-Version:        1.3_8
+Version:        1.3_9
 Release:        1
 License:        GPLv2
 Summary:        Connection Manager

diff --git a/plugins/wifi.c b/plugins/wifi.c
index c50f877..c6dbede 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -56,7 +56,12 @@
 
 #define CLEANUP_TIMEOUT   8    /* in seconds */
 #define INACTIVE_TIMEOUT  12   /* in seconds */
+
+#if defined TIZEN_EXT
+#define MAXIMUM_RETRIES   1
+#else
 #define MAXIMUM_RETRIES   4
+#endif
 
 #define BGSCAN_DEFAULT "simple:30:-45:300"
 #define AUTOSCAN_DEFAULT "exponential:3:300"