Fix bug TDIS-4906(Connection not established)

Change-Id: Ifcc31fc430b3df536b1558513b034d3e399e3037

diff --git a/debian/changelog b/debian/changelog
index 736de5a..28640b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
+wfi-direct-manager (0.6.12) precise; urgency=low
+
+  * Flush discovered peer data when starting new scan
+  * Git : framework/connectivity/wifi-direct-manager
+  * Tag : wifi-direct-manager_0.6.12
+
+ -- Gibyoung Kim <lastkgb.kim@samsung.com>  Fri, 29 Mar 2013 16:28:05 +0900
+
 wfi-direct-manager (0.6.11) precise; urgency=low
 
   * Flush discovered peer data when starting new scan
   * Git : framework/connectivity/wifi-direct-manager
-  * Tag : wifi-direct-manager_0.6.10
+  * Tag : wifi-direct-manager_0.6.11
 
  -- Gibyoung Kim <lastkgb.kim@samsung.com>  Wed, 13 Mar 2013 13:53:42 +0900
 

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index d6020c3..114d65f 100755 (executable)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:       wifi-direct-manager
 Summary:    Wi-Fi Direct manger
-Version:    0.6.11
+Version:    0.6.12
 Release:    1
 Group:      TO_BE_FILLED
 License:    Apache License Version 2.0
@@ -49,8 +49,8 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 %make_install
-%__strip %{buildroot}%{_libdir}/wifi-direct-plugin-wpasupplicant.so
-%__strip %{buildroot}%{_bindir}/wfd-manager
+#%__strip %{buildroot}%{_libdir}/wifi-direct-plugin-wpasupplicant.so
+#%__strip %{buildroot}%{_bindir}/wfd-manager
 
 mkdir -p %{buildroot}/usr/share/license
 cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}

diff --git a/plugin/wpasupplicant/src/wifi-direct-plugin.c b/plugin/wpasupplicant/src/wifi-direct-plugin.c
index 0693329..5c5fdef 100644 (file)
--- a/plugin/wpasupplicant/src/wifi-direct-plugin.c
+++ b/plugin/wpasupplicant/src/wifi-direct-plugin.c
@@ -2764,8 +2764,6 @@ int wfd_ws_start_discovery(bool listen_only, int timeout)
        int res_buffer_len=sizeof(res_buffer);
        int result = 0;
 
-       wfd_ws_flush();
-
        if (listen_only == true)
        {
                if (timeout > 0)
@@ -2778,6 +2776,8 @@ int wfd_ws_start_discovery(bool listen_only, int timeout)
        }
        else
        {
+               wfd_ws_flush();
+
                strncpy(cmd, CMD_START_DISCOVER, sizeof(cmd));
                result = __send_wpa_request(g_control_sockfd, cmd, (char*)res_buffer, res_buffer_len);
                WDP_LOGD( "__send_wpa_request(P2P_FIND) result=[%d]\n", result);