Index: /branches/rel_apv_10_7/usr/click/lib/libuinet-atcp/lib/libuinet/uinet_host_interface.c
===================================================================
--- /branches/rel_apv_10_7/usr/click/lib/libuinet-atcp/lib/libuinet/uinet_host_interface.c	(revision 40226)
+++ /branches/rel_apv_10_7/usr/click/lib/libuinet-atcp/lib/libuinet/uinet_host_interface.c	(working copy)
@@ -2034,50 +2034,6 @@
 }
 
 int
-uhi_fastlog_receive(int loops)
-{
-        size_t len;
-        log_entry_t new_entry;
-
-        if (fastlog_sock_init() != 0) {
-                return -1;
-        }
-
-        for (;loops--;) {
-                len = read(fastlog_fd, &new_entry, sizeof(new_entry));
-                if (len == -1 && errno == EWOULDBLOCK) {
-                        return -1;
-                } else if (len <= 0) {
-                        close(fastlog_fd);
-                        fastlog_fd = -1;
-                        if (fastlog_sock_init() != 0) {
-                                return -1;
-                        }
-                } else if (len == sizeof(new_entry)) {
-                        real_fastlog(&new_entry);
-                } else {
-					ssize_t more;
-					size_t remaining = sizeof(new_entry) - len;
-
-					more = read(fastlog_fd, ((char *)&new_entry) + len, remaining);
-
-					if (more > 0) {
-						len += more;
-					}
-
-					if (len == sizeof(new_entry)) {
-						real_fastlog(&new_entry);
-					} else {
-						printf("ERROR: fastlog entry is incomplete (%zu/%zu).\n",
-							len, sizeof(new_entry));
-					}
-				}
-        }
-
-	return 0;
-}
-
-int
 fastlog_register_conn(int ns)
 {
 	struct epoll_event events;
Index: /branches/rel_apv_10_7/usr/src/sys/click/app/fastlog/fastlog.c
===================================================================
--- /branches/rel_apv_10_7/usr/src/sys/click/app/fastlog/fastlog.c	(revision 40226)
+++ /branches/rel_apv_10_7/usr/src/sys/click/app/fastlog/fastlog.c	(working copy)
@@ -2930,7 +2930,6 @@
 	int i,j;
 	log_entry_t *logentry;
 	#define ATCP_QUEUE	0
-	#define FASTLOG_QUEUE   1
 	#define GLOBAL_QUEUE	2
 	static int que_next = ATCP_QUEUE;
 	static int th_next = 0;
@@ -2957,20 +2956,6 @@
 			j_next = 0;
 		}
 		th_next = 0;
-		que_next = FASTLOG_QUEUE;
-	}
-
-	if (que_next == FASTLOG_QUEUE) {
-		/* receive fastlog via Unix Socket */
-		for (j = j_next; j < 100; j++) {
-			if (uhi_fastlog_receive(1) < 0) break; // HERE
-			/*check fastlog runing ticks*/
-			if (ticks - func_ticks > fastlog_ticks_limit) {
-				j_next = ++j;
-				return;
-			}
-		}
-		j_next = 0;
 		que_next = GLOBAL_QUEUE;
 	}