Remove model_build_feature_wlan_concurrent_mode

Change-Id: Ied172b6808b209ef1b46716bc523a5100742ce73

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 293111cb1f05a494401a931b094bc08ec5f6ecb5..e6a40c7d0d395c06ef61e9577decf2d7ab321928 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,10 +96,6 @@ SET(CMAKE_C_FLAGS "-I${CMAKE_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/include ${CMAKE_C
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fPIE")
 SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE")
 
-IF(WLAN_CONCURRENT_MODE)
-       ADD_DEFINITIONS(-DWLAN_CONCURRENT_MODE)
-ENDIF(WLAN_CONCURRENT_MODE)
-
 FIND_PROGRAM(UNAME NAMES uname)
 EXEC_PROGRAM("${UNAME}" ARGS "-m"
 OUTPUT_VARIABLE "ARCH")

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 4ac26a5e30a0f7ae9eea248c745fbba317c5fd34..a3c24b39c378e473d420cc1c93be9ebce0fa6025 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -75,9 +75,6 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DTIZEN_WLAN_PASSPOINT=1 \
        -DTIZEN_WLAN_USE_P2P_INTERFACE=1 \
        -DTIZEN_DEBUG_ENABLE=1 \
-%if 0%{?model_build_feature_wlan_concurrent_mode}
-       -DWLAN_CONCURRENT_MODE=1 \
-%endif
 %if 0%{?model_build_feature_wlan_wearable} == 1
        -DTIZEN_WEARABLE=1 \
        -DTIZEN_CAPTIVE_PORTAL=1 \

diff --git a/src/wifi-firmware.c b/src/wifi-firmware.c
index 9a971af870e74fa6486fbc0f122b4c93ef665afa..3cfd322d61f0e967b177001ad61822ea2a05d7a9 100755 (executable)
--- a/src/wifi-firmware.c
+++ b/src/wifi-firmware.c
@@ -211,13 +211,6 @@ int netconfig_wifi_firmware(enum netconfig_wifi_firmware type, gboolean enable)
        static enum netconfig_wifi_firmware current_driver = NETCONFIG_WIFI_OFF;
        enum netconfig_wifi_firmware alias = type;
 
-#if defined WLAN_CONCURRENT_MODE
-       int flight_mode = 0;
-
-       if (type == NETCONFIG_WIFI_P2P)
-               alias = NETCONFIG_WIFI_STA;
-#endif
-
        DBG("Wi-Fi current firmware %d (type: %d %s)", current_driver, type,
                                                        enable == TRUE ? "enable" : "disable");
 
@@ -226,21 +219,6 @@ int netconfig_wifi_firmware(enum netconfig_wifi_firmware type, gboolean enable)
                        return -EALREADY;
                } else if (current_driver == alias) {
 
-#if defined WLAN_CONCURRENT_MODE
-                       netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &flight_mode);
-                       if (flight_mode == 0 && type == NETCONFIG_WIFI_STA &&
-                                       netconfig_is_wifi_direct_on() == TRUE) {
-                               netconfig_interface_down(WIFI_IFNAME);
-
-                               return -EALREADY;
-                       }
-
-                       if (type == NETCONFIG_WIFI_P2P && wifi_state_get_technology_state() > NETCONFIG_WIFI_TECH_OFF) {
-                               netconfig_interface_down(WLAN_P2P_IFACE_NAME);
-
-                               return -EALREADY;
-                       }
-#endif
                        err = __netconfig_wifi_firmware_stop(type);
                        if (err < 0 && err != -EALREADY)
                                return err;
@@ -254,17 +232,8 @@ int netconfig_wifi_firmware(enum netconfig_wifi_firmware type, gboolean enable)
        }
 
        if (current_driver > NETCONFIG_WIFI_OFF) {
-               if (current_driver == alias) {
-
-#if defined WLAN_CONCURRENT_MODE
-                       if (type == NETCONFIG_WIFI_STA)
-                               netconfig_interface_up(WIFI_IFNAME);
-                       else if (netconfig_check_feature_supported(NETCONFIG_SUPPORTED_FEATURE_WIFI_DIRECT)) &&
-                               type == NETCONFIG_WIFI_P2P)
-                               netconfig_interface_up(WLAN_P2P_IFACE_NAME);
-#endif
+               if (current_driver == alias)
                        return -EALREADY;
-               }
 
                return -EIO;
        }