Remove Tizen specific hidden connection logic

[platform/upstream/connman.git] / plugins / wifi.c

diff --git a/plugins/wifi.c b/plugins/wifi.c
index cc5f242..1739e58 100755 (executable)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -1930,19 +1930,9 @@ static int wifi_scan(enum connman_service_type type,
 
        reset_autoscan(device);
 
-#if defined TIZEN_EXT
-       if (wifi->hidden) {
-               ret = g_supplicant_interface_scan(wifi->interface, scan_params,
-                                               scan_callback, device);
-       }
-       else {
-               ret = g_supplicant_interface_scan(wifi->interface, NULL,
-                                                       scan_callback_hidden, device);
-       }
-#else
        ret = g_supplicant_interface_scan(wifi->interface, scan_params,
                                                scan_callback, device);
-#endif
+
        if (ret == 0) {
                connman_device_set_scanning(device,
                                CONNMAN_SERVICE_TYPE_WIFI, true);
@@ -2509,11 +2499,6 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
        wifi->retries = 0;
        connman_network_set_error(network, CONNMAN_NETWORK_ERROR_INVALID_KEY);
 
-#if defined TIZEN_EXT
-       /* not retry autoconnect in case of invalid-key error */
-       __connman_service_set_autoconnect(service, false);
-#endif
-
        return false;
 }
 
@@ -2991,7 +2976,12 @@ static void network_added(GSupplicantNetwork *supplicant_network)
 #endif
 
        if (wifi->hidden && ssid) {
+#if defined TIZEN_EXT
+               if (network_security(wifi->hidden->security) ==
+                       network_security(security) &&
+#else
                if (!g_strcmp0(wifi->hidden->security, security) &&
+#endif
                                wifi->hidden->ssid_len == ssid_len &&
                                !memcmp(wifi->hidden->ssid, ssid, ssid_len)) {
                        connman_network_connect_hidden(network,