From: seonah moon <seonah1.moon@samsung.com>
Date: Fri, 29 May 2015 04:26:09 +0000 (-0700)
Subject: Revert "Add TIZEN_EXT patch to ignore rfkill block"
X-Git-Tag: accepted/tizen/common/20150601.145645~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F40099%2F1;p=platform%2Fupstream%2Fconnman.git

Revert "Add TIZEN_EXT patch to ignore rfkill block"

This reverts commit 9e7ccc53900e9fe24bfcf56c22a4c6be7b002dc5.

Change-Id: I369ccf417c12a24c80aaed902127c80b3f109ce2
---

diff --git a/configure.ac b/configure.ac
index 55e983b..dee2dcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,12 +61,6 @@ AC_ARG_ENABLE(hh2serial-gps,
 AM_CONDITIONAL(HH2SERIAL_GPS, test "${enable_hh2serial_gps}" != "no")
 AM_CONDITIONAL(HH2SERIAL_GPS_BUILTIN, test "${enable_hh2serial_gps}" = "builtin")
 
-AC_ARG_ENABLE(tizen-ext,
-	AC_HELP_STRING([--enable-tizen-ext], [enable TIZEN extensions]),
-			[if (test "${enableval}" = "yes"); then
-				CFLAGS="$CFLAGS -DTIZEN_EXT"
-			fi])
-
 AC_ARG_ENABLE(telephony,
 	AC_HELP_STRING([--enable-telephony], [enable Telephony support]),
 			[enable_telephony=${enableval}], [enable_telephony="yes"])
diff --git a/packaging/connman.spec b/packaging/connman.spec
index 7747d9b..830977e 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -94,7 +94,6 @@ chmod +x bootstrap
             --enable-threads \
             --enable-client \
             --enable-pacrunner \
-            --enable-tizen-ext \
             --enable-wifi=builtin \
 %if %{with connman_openconnect}
             --enable-openconnect \
diff --git a/resources/var/lib/connman/settings b/resources/var/lib/connman/settings
index 36f38f5..ba476b5 100644
--- a/resources/var/lib/connman/settings
+++ b/resources/var/lib/connman/settings
@@ -1,3 +1,4 @@
+
 [global]
 OfflineMode=false
 
diff --git a/src/rfkill.c b/src/rfkill.c
index bbb4dd7..960cfea 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -73,7 +73,6 @@ static enum connman_service_type convert_type(uint8_t type)
 	return CONNMAN_SERVICE_TYPE_UNKNOWN;
 }
 
-#if !defined TIZEN_EXT
 static enum rfkill_type convert_service_type(enum connman_service_type type)
 {
 	switch (type) {
@@ -96,7 +95,6 @@ static enum rfkill_type convert_service_type(enum connman_service_type type)
 
 	return NUM_RFKILL_TYPES;
 }
-#endif
 
 static GIOStatus rfkill_process(GIOChannel *chan)
 {
@@ -159,20 +157,13 @@ static GIOChannel *channel = NULL;
 
 int __connman_rfkill_block(enum connman_service_type type, bool block)
 {
-#if !defined TIZEN_EXT
 	uint8_t rfkill_type;
 	struct rfkill_event event;
 	ssize_t len;
 	int fd, err;
-#endif
 
 	DBG("type %d block %d", type, block);
 
-#if defined TIZEN_EXT
-	DBG("try to set rfkill block %d, but it's not permitted", block);
-
-	return 0;
-#else
 	rfkill_type = convert_service_type(type);
 	if (rfkill_type == NUM_RFKILL_TYPES)
 		return -EINVAL;
@@ -196,7 +187,6 @@ int __connman_rfkill_block(enum connman_service_type type, bool block)
 	close(fd);
 
 	return err;
-#endif
 }
 
 int __connman_rfkill_init(void)