diff options
author | seonah moon <seonah1.moon@samsung.com> | 2015-05-28 21:26:09 -0700 |
---|---|---|
committer | seonah moon <seonah1.moon@samsung.com> | 2015-05-28 21:26:09 -0700 |
commit | 5eff96f0f0c67bc7233e8600fd077a0af1ed1230 (patch) | |
tree | 8d6ffc42a0209a5974c201c3d5d13639c0f59b98 /src/rfkill.c | |
parent | 9e7ccc53900e9fe24bfcf56c22a4c6be7b002dc5 (diff) | |
download | connman-5eff96f0f0c67bc7233e8600fd077a0af1ed1230.tar.gz connman-5eff96f0f0c67bc7233e8600fd077a0af1ed1230.tar.bz2 connman-5eff96f0f0c67bc7233e8600fd077a0af1ed1230.zip |
Revert "Add TIZEN_EXT patch to ignore rfkill block"
This reverts commit 9e7ccc53900e9fe24bfcf56c22a4c6be7b002dc5.
Change-Id: I369ccf417c12a24c80aaed902127c80b3f109ce2
Diffstat (limited to 'src/rfkill.c')
-rw-r--r-- | src/rfkill.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/rfkill.c b/src/rfkill.c index bbb4dd72..960cfea7 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) |