Revert: [TNEXT-136] Check model name for wlan driver

Change-Id: Idff0eee072bc7bad9c26b8be1a791abad493337c
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/include/util.h b/include/util.h
index d7e9602..2cce5ee 100755 (executable)
--- a/include/util.h
+++ b/include/util.h
@@ -95,15 +95,8 @@ typedef enum {
 } tizen_profile_t;
 extern tizen_profile_t _get_tizen_profile();
 
-typedef enum {
-       TIZEN_WLAN_DRIVER_UNKNOWN = 0,
-       TIZEN_WLAN_DRIVER_BROADCOM = 1,
-       TIZEN_WLAN_DRIVER_SPRD = 2,
-} tizen_wlan_driver_t;
-extern tizen_wlan_driver_t _get_wlan_driver();
-
 #define TIZEN_TELEPHONY_ENABLE (_get_tizen_profile() == TIZEN_PROFILE_MOBILE)
-#define TIZEN_WLAN_BOARD_SPRD (_get_wlan_driver() == TIZEN_WLAN_DRIVER_SPRD)
+#define TIZEN_WLAN_BOARD_SPRD (_get_tizen_profile() == TIZEN_PROFILE_MOBILE)
 #define TIZEN_TV (_get_tizen_profile() == TIZEN_PROFILE_TV)
 #define TIZEN_NTP_ENABLE (_get_tizen_profile() == TIZEN_PROFILE_IVI)
 

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 5fb9e84..deb7d23 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,6 +1,6 @@
 Name:          net-config
 Summary:       TIZEN Network Configuration service
-Version:       1.1.103
+Version:       1.1.104
 Release:       2
 Group:         System/Network
 License:       Apache-2.0

diff --git a/src/utils/util.c b/src/utils/util.c
index a5c2595..6efd972 100755 (executable)
--- a/src/utils/util.c
+++ b/src/utils/util.c
@@ -1048,31 +1048,6 @@ tizen_profile_t _get_tizen_profile()
        return profile;
 }
 
-tizen_wlan_driver_t _get_wlan_driver(void)
-{
-       static tizen_wlan_driver_t drv = TIZEN_WLAN_DRIVER_UNKNOWN;
-       if (__builtin_expect(drv != TIZEN_WLAN_DRIVER_UNKNOWN, 1))
-               return drv;
-
-       char *model_name = NULL;
-       int ret = 0;
-
-       ret = system_info_get_platform_string("http://tizen.org/system/model_name", &model_name);
-       if (ret != SYSTEM_INFO_ERROR_NONE) {
-               ERR("Failed to get system information(%d)", ret);
-               return drv;
-       }
-
-       if (model_name && strncmp(model_name, "TM1", sizeof("TM1")) == 0)
-               drv = TIZEN_WLAN_DRIVER_SPRD;
-       else if (strncmp(model_name, "n4", sizeof("n4")) == 0)
-               drv = TIZEN_WLAN_DRIVER_BROADCOM;
-
-       free(model_name);
-
-       return drv;
-}
-
 void netconfig_plugin_init()
 {
        handle_headed = dlopen(HEADED_PLUGIN_FILEPATH, RTLD_NOW);

diff --git a/src/wifi-firmware.c b/src/wifi-firmware.c
index 1c940df..d9a41f9 100755 (executable)
--- a/src/wifi-firmware.c
+++ b/src/wifi-firmware.c
@@ -44,11 +44,9 @@ static int __netconfig_sta_firmware_start(void)
        char *const args[] = { "/usr/bin/wlan.sh", "start", NULL };
        char *const envs[] = { NULL };
 
-       if (TIZEN_WLAN_BOARD_SPRD) {
-               rv = netconfig_execute_file(path, args, envs);
-               if (rv < 0)
-                       return -EIO;
-       }
+       rv = netconfig_execute_file(path, args, envs);
+       if (rv < 0)
+               return -EIO;
 
        rv = netconfig_interface_up(WLAN_IFACE_NAME);
        if (rv != TRUE)
@@ -72,11 +70,9 @@ static int __netconfig_sta_firmware_stop(void)
        if (rv != TRUE)
                return -EIO;
 
-       if (TIZEN_WLAN_BOARD_SPRD) {
-               rv = netconfig_execute_file(path, args, envs);
-               if (rv < 0)
-                       return -EIO;
-       }
+       rv = netconfig_execute_file(path, args, envs);
+       if (rv < 0)
+               return -EIO;
 
        DBG("Successfully removed wireless device driver");
        return 0;