technology: Remove global rfkill table

[framework/connectivity/connman.git] / src / rfkill.c

diff --git a/src/rfkill.c b/src/rfkill.c
index 523c7e7..3d214ef 100644 (file)
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -99,18 +99,19 @@ static GIOStatus rfkill_process(GIOChannel *chan)
                                                event->type, event->op,
                                                event->soft, event->hard);
 
+       type = convert_type(event->type);
+
        switch (event->op) {
        case RFKILL_OP_ADD:
-               type = convert_type(event->type);
                __connman_technology_add_rfkill(event->idx, type,
                                                event->soft, event->hard);
                break;
        case RFKILL_OP_DEL:
-               __connman_technology_remove_rfkill(event->idx);
+               __connman_technology_remove_rfkill(event->idx, type);
                break;
        case RFKILL_OP_CHANGE:
-               __connman_technology_update_rfkill(event->idx, event->soft,
-                                                               event->hard);
+               __connman_technology_update_rfkill(event->idx, type,
+                                               event->soft, event->hard);
                break;
        default:
                break;
@@ -149,6 +150,9 @@ int __connman_rfkill_init(void)
        channel = g_io_channel_unix_new(fd);
        g_io_channel_set_close_on_unref(channel, TRUE);
 
+       g_io_channel_set_encoding(channel, NULL, NULL);
+       g_io_channel_set_buffered(channel, FALSE);
+
        flags = g_io_channel_get_flags(channel);
        flags |= G_IO_FLAG_NONBLOCK;
        g_io_channel_set_flags(channel, flags, NULL);