From: Nishant Chaprana <n.chaprana@samsung.com>
Date: Fri, 21 Aug 2015 08:32:02 +0000 (+0530)
Subject: Fixed Tizen Profile Build Flags and updated WLAN_P2P_IFACE_NAME value
X-Git-Tag: accepted/tizen/mobile/20150826.070005^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F16%2F46516%2F1;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

Fixed Tizen Profile Build Flags and updated WLAN_P2P_IFACE_NAME value

Description: The profile build flags were wrong and were not
             building according to the profile type.
             Also WLAN_P2P_IFACE_NAME value is updated for Tizen TV
             profile and other profiles.

Change-Id: I96c1be7a283de91d85e3b77707f45a0ff1350017
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
---

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 21e540a..6c03bbe 100755
--- 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.33
+Version:	1.1.34
 Release:	2
 Group:		System/Network
 License:	Apache-2.0
@@ -45,7 +45,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %if ! 0%{?model_build_feature_network_tethering_disable}
 	-DTIZEN_TETHERING_ENABLE=1 \
 %endif
-%if "%{?tizen_profile_name}" == "tv"
+%if "%{profile}" == "tv"
 	-DTIZEN_TV=1 \
 %endif
 %if 0%{?model_build_feature_wlan_wearable} == 1
@@ -66,7 +66,7 @@ mkdir -p %{buildroot}%{_libdir}/systemd/system/
 mkdir -p %{buildroot}%{_unitdir}
 %endif
 
-%if "%{?tizen_profile_name}" == "tv"
+%if "%{profile}" == "tv"
 cp resources/usr/lib/systemd/system/net-config_tv.service %{buildroot}%{_libdir}/systemd/system/net-config.service
 mkdir -p %{buildroot}%{_libdir}/udev/rules.d/
 cp resources/usr/lib/udev/rules.d/99-wifiusb-dev.rules %{buildroot}%{_libdir}/udev/rules.d/99-wifiusb-dev.rules
@@ -119,7 +119,7 @@ cp LICENSE %{buildroot}%{_datadir}/license/net-config
 
 %post
 
-%if "%{?tizen_profile_name}" == "tv"
+%if "%{profile}" == "tv"
 vconftool set -t string db/dnet/mac_address "" -s system::vconf_network
 %endif
 
@@ -192,7 +192,7 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %attr(500,root,root) /opt/etc/dump.d/module.d/network_log_dump.sh
 %attr(500,root,root) /opt/var/lib/net-config/network_log_dump.sh
 %attr(500,root,root) /opt/var/lib/net-config/network_dump.sh
-%if "%{?tizen_profile_name}" == "tv"
+%if "%{profile}" == "tv"
 %attr(644,root,root) %{_libdir}/udev/rules.d/99-wifiusb-dev.rules
 %endif
 %if 0%{?model_build_feature_wlan_wearable} == 1
diff --git a/src/wifi-firmware.c b/src/wifi-firmware.c
index da68654..12ee7bf 100755
--- a/src/wifi-firmware.c
+++ b/src/wifi-firmware.c
@@ -35,7 +35,12 @@
 
 #define WLAN_DRIVER_SCRIPT			"/usr/bin/wlan.sh"
 #define WLAN_IFACE_NAME				"wlan0"
+
+#if defined(TIZEN_TV)
 #define WLAN_P2P_IFACE_NAME			"p2p0"
+#else /* defined(TIZEN_TV) */
+#define WLAN_P2P_IFACE_NAME			"wlan0"
+#endif /* defined(TIZEN_TV) */
 
 static int __netconfig_sta_firmware_start(void)
 {
@@ -89,11 +94,7 @@ static int __netconfig_p2p_firmware_start(void)
 	rv = netconfig_execute_file(path, args, envs);
 	if (rv < 0)
 		return -EIO;
-#if 0
-	rv = netconfig_interface_up(WLAN_IFACE_NAME);
-	if (rv != TRUE)
-		return -EIO;
-#endif
+
 #if defined TIZEN_WLAN_USE_P2P_INTERFACE
 	rv = netconfig_interface_up(WLAN_P2P_IFACE_NAME);
 	if (rv != TRUE)