 @@ -8,38 +8,47 @@
 #include "includes.h"
 #include <assert.h>
 #include "common.h"
 #include "trace.h"
 #include "list.h"
 #include "eloop.h"
 #if defined(CONFIG_ELOOP_POLL) && defined(CONFIG_ELOOP_EPOLL)
 #error Do not define both of poll and epoll
 #endif
-#if !defined(CONFIG_ELOOP_POLL) && !defined(CONFIG_ELOOP_EPOLL)
+#if defined(CONFIG_ELOOP_POLL) && defined(CONFIG_ELOOP_KQUEUE)
 #error Do not define both of poll and kqueue
 #endif
 #if !defined(CONFIG_ELOOP_POLL) && !defined(CONFIG_ELOOP_EPOLL) && \
     !defined(CONFIG_ELOOP_KQUEUE)
 #define CONFIG_ELOOP_SELECT
 #endif
 #ifdef CONFIG_ELOOP_POLL
 #include <poll.h>
 #endif /* CONFIG_ELOOP_POLL */
 #ifdef CONFIG_ELOOP_EPOLL
 #include <sys/epoll.h>
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 #include <sys/event.h>
 #endif /* CONFIG_ELOOP_KQUEUE */
 struct eloop_sock {
 	int sock;
 	void *eloop_data;
 	void *user_data;
 	eloop_sock_handler handler;
 	WPA_TRACE_REF(eloop)
 	WPA_TRACE_REF(user)
 	WPA_TRACE_INFO
 };
 struct eloop_timeout {
 	struct dl_list list;
 	struct os_reltime time;
 @@ -51,50 +60,57 @@ struct eloop_timeout {
 	WPA_TRACE_INFO
 };
 struct eloop_signal {
 	int sig;
 	void *user_data;
 	eloop_signal_handler handler;
 	int signaled;
 };
 struct eloop_sock_table {
 	int count;
 	struct eloop_sock *table;
-#ifdef CONFIG_ELOOP_EPOLL
+#if defined(CONFIG_ELOOP_EPOLL) || defined(CONFIG_ELOOP_KQUEUE)
 	eloop_event_type type;
 #else /* CONFIG_ELOOP_EPOLL */
 	int changed;
 #endif /* CONFIG_ELOOP_EPOLL */
 };
 struct eloop_data {
 	int max_sock;
 	int count; /* sum of all table counts */
 #ifdef CONFIG_ELOOP_POLL
 	int max_pollfd_map; /* number of pollfds_map currently allocated */
 	int max_poll_fds; /* number of pollfds currently allocated */
 	struct pollfd *pollfds;
 	struct pollfd **pollfds_map;
 #endif /* CONFIG_ELOOP_POLL */
 #if defined(CONFIG_ELOOP_EPOLL) || defined(CONFIG_ELOOP_KQUEUE)
 	int max_fd;
 	struct eloop_sock *fd_table;
 #endif
 #ifdef CONFIG_ELOOP_EPOLL
 	int epollfd;
 	int epoll_max_event_num;
 	int epoll_max_fd;
 	struct eloop_sock *epoll_table;
 	struct epoll_event *epoll_events;
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	int kqueuefd;
 	int kqueue_nevents;
 	struct kevent *kqueue_events;
 #endif /* CONFIG_ELOOP_KQUEUE */
 	struct eloop_sock_table readers;
 	struct eloop_sock_table writers;
 	struct eloop_sock_table exceptions;
 	struct dl_list timeout;
 	int signal_count;
 	struct eloop_signal *signals;
 	int signaled;
 	int pending_terminate;
 	int terminate;
 };
 @@ -150,42 +166,55 @@ int eloop_init(void)
 	os_memset(&eloop, 0, sizeof(eloop));
 	dl_list_init(&eloop.timeout);
 #ifdef CONFIG_ELOOP_EPOLL
 	eloop.epollfd = epoll_create1(0);
 	if (eloop.epollfd < 0) {
 		wpa_printf(MSG_ERROR, "%s: epoll_create1 failed. %s\n",
 			   __func__, strerror(errno));
 		return -1;
+	}
 	eloop.readers.type = EVENT_TYPE_READ;
 	eloop.writers.type = EVENT_TYPE_WRITE;
 	eloop.exceptions.type = EVENT_TYPE_EXCEPTION;
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	eloop.kqueuefd = kqueue();
 	if (eloop.kqueuefd < 0) {
 		wpa_printf(MSG_ERROR, "%s: kqueue failed. %s\n",
 			   __func__, strerror(errno));
 		return -1;
+	}
 #endif /* CONFIG_ELOOP_KQUEUE */
 #ifdef WPA_TRACE
 	signal(SIGSEGV, eloop_sigsegv_handler);
 #endif /* WPA_TRACE */
 	return 0;
+}
 static int eloop_sock_table_add_sock(struct eloop_sock_table *table,
                                      int sock, eloop_sock_handler handler,
                                      void *eloop_data, void *user_data)
+{
 #ifdef CONFIG_ELOOP_EPOLL
 	struct eloop_sock *temp_table;
 	struct epoll_event ev, *temp_events;
 	int next;
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	struct eloop_sock *temp_table;
 	int next, filter;
 	struct kevent ke;
 #endif
 	struct eloop_sock *tmp;
 	int new_max_sock;
 	if (sock > eloop.max_sock)
 		new_max_sock = sock;
 	else
 		new_max_sock = eloop.max_sock;
 	if (table == NULL)
 		return -1;
 #ifdef CONFIG_ELOOP_POLL
 	if (new_max_sock >= eloop.max_pollfd_map) {
 @@ -201,72 +230,89 @@ static int eloop_sock_table_add_sock(str
 	if (eloop.count + 1 > eloop.max_poll_fds) {
 		struct pollfd *n;
 		int nmax = eloop.count + 1 + 50;
 		n = os_realloc_array(eloop.pollfds, nmax,
 				     sizeof(struct pollfd));
 		if (n == NULL)
 			return -1;
 		eloop.max_poll_fds = nmax;
 		eloop.pollfds = n;
+	}
 #endif /* CONFIG_ELOOP_POLL */
-#ifdef CONFIG_ELOOP_EPOLL
+#if defined(CONFIG_ELOOP_EPOLL) || defined(CONFIG_ELOOP_KQUEUE)
-	if (new_max_sock >= eloop.epoll_max_fd) {
+	if (new_max_sock >= eloop.max_fd) {
-		next = eloop.epoll_max_fd == 0 ? 16 : eloop.epoll_max_fd * 2;
+		next = eloop.max_fd == 0 ? 16 : eloop.max_fd * 2;
-		temp_table = os_realloc_array(eloop.epoll_table, next,
+		temp_table = os_realloc_array(eloop.fd_table, next,
 					      sizeof(struct eloop_sock));
 		if (temp_table == NULL)
 			return -1;
-		eloop.epoll_max_fd = next;
+		eloop.max_fd = next;
-		eloop.epoll_table = temp_table;
+		eloop.fd_table = temp_table;
+	}
 #endif
 #ifdef CONFIG_ELOOP_EPOLL
 	if (eloop.count + 1 > eloop.epoll_max_event_num) {
 		next = eloop.epoll_max_event_num == 0 ? 8 :
 			eloop.epoll_max_event_num * 2;
 		temp_events = os_realloc_array(eloop.epoll_events, next,
 					       sizeof(struct epoll_event));
 		if (temp_events == NULL) {
 			wpa_printf(MSG_ERROR, "%s: malloc for epoll failed. "
 				   "%s\n", __func__, strerror(errno));
 			return -1;
+		}
 		eloop.epoll_max_event_num = next;
 		eloop.epoll_events = temp_events;
+	}
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	if (eloop.count + 1 > eloop.kqueue_nevents) {
 		next = eloop.kqueue_nevents == 0 ? 8 : eloop.kqueue_nevents * 2;
 		os_free(eloop.kqueue_events);
 		eloop.kqueue_events = os_malloc(next *
 					        sizeof(eloop.kqueue_events));
 		if (eloop.kqueue_events == NULL) {
 			wpa_printf(MSG_ERROR, "%s: malloc for kqueue failed. "
 				   "%s\n", __func__, strerror(errno));
 			return -1;
+		}
 		eloop.kqueue_nevents = next;
+	}
 #endif /* CONFIG_ELOOP_KQUEUE */
 	eloop_trace_sock_remove_ref(table);
 	tmp = os_realloc_array(table->table, table->count + 1,
 			       sizeof(struct eloop_sock));
 	if (tmp == NULL) {
 		eloop_trace_sock_add_ref(table);
 		return -1;
+	}
 	tmp[table->count].sock = sock;
 	tmp[table->count].eloop_data = eloop_data;
 	tmp[table->count].user_data = user_data;
 	tmp[table->count].handler = handler;
 	wpa_trace_record(&tmp[table->count]);
 	table->count++;
 	table->table = tmp;
 	eloop.max_sock = new_max_sock;
 	eloop.count++;
-#ifndef CONFIG_ELOOP_EPOLL
+#if !defined(CONFIG_ELOOP_EPOLL) && !defined(CONFIG_ELOOP_KQUEUE)
 	table->changed = 1;
 #endif /* CONFIG_ELOOP_EPOLL */
 	eloop_trace_sock_add_ref(table);
 #ifdef CONFIG_ELOOP_EPOLL
 	os_memset(&ev, 0, sizeof(ev));
 	switch (table->type) {
 	case EVENT_TYPE_READ:
 		ev.events = EPOLLIN;
 		break;
 	case EVENT_TYPE_WRITE:
 		ev.events = EPOLLOUT;
 		break;
 @@ -275,67 +321,99 @@ static int eloop_sock_table_add_sock(str
 	 * possible that someone registered a socket *only* for exception
 	 * handling.
 	 */
 	case EVENT_TYPE_EXCEPTION:
 		ev.events = EPOLLERR | EPOLLHUP;
 		break;
+	}
 	ev.data.fd = sock;
 	if (epoll_ctl(eloop.epollfd, EPOLL_CTL_ADD, sock, &ev) < 0) {
 		wpa_printf(MSG_ERROR, "%s: epoll_ctl(ADD) for fd=%d "
 			   "failed. %s\n", __func__, sock, strerror(errno));
 		return -1;
+	}
-	os_memcpy(&eloop.epoll_table[sock], &table->table[table->count - 1],
+	os_memcpy(&eloop.fd_table[sock], &table->table[table->count - 1],
 		  sizeof(struct eloop_sock));
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	switch (table->type) {
 	case EVENT_TYPE_READ:
 		filter = EVFILT_READ;
 		break;
 	case EVENT_TYPE_WRITE:
 		filter = EVFILT_WRITE;
 		break;
 	default:
 		filter = 0;
+	}
 	EV_SET(&ke, sock, filter, EV_ADD, 0, 0, NULL);
 	if (kevent(eloop.kqueuefd, &ke, 1, NULL, 0, NULL) == -1) {
 		wpa_printf(MSG_ERROR, "%s: kevent(ADD) for fd=%d "
 			   "failed. %s\n", __func__, sock, strerror(errno));
 		return -1;
+	}
 	os_memcpy(&eloop.fd_table[sock], &table->table[table->count - 1],
 		  sizeof(struct eloop_sock));
 #endif /* CONFIG_ELOOP_KQUEUE */
 	return 0;
+}
 static void eloop_sock_table_remove_sock(struct eloop_sock_table *table,
                                          int sock)
+{
 #ifdef CONFIG_ELOOP_KQUEUE
 	struct kevent ke;
 #endif
 	int i;
 	if (table == NULL || table->table == NULL || table->count == 0)
 		return;
 	for (i = 0; i < table->count; i++) {
 		if (table->table[i].sock == sock)
 			break;
+	}
 	if (i == table->count)
 		return;
 	eloop_trace_sock_remove_ref(table);
 	if (i != table->count - 1) {
 		os_memmove(&table->table[i], &table->table[i + 1],
 			   (table->count - i - 1) *
 			   sizeof(struct eloop_sock));
+	}
 	table->count--;
 	eloop.count--;
-#ifndef CONFIG_ELOOP_EPOLL
+#if !defined(CONFIG_ELOOP_EPOLL) && !defined(CONFIG_ELOOP_KQUEUE)
 	table->changed = 1;
 #endif /* CONFIG_ELOOP_EPOLL */
 	eloop_trace_sock_add_ref(table);
 #ifdef CONFIG_ELOOP_EPOLL
 	if (epoll_ctl(eloop.epollfd, EPOLL_CTL_DEL, sock, NULL) < 0) {
 		wpa_printf(MSG_ERROR, "%s: epoll_ctl(DEL) for fd=%d "
 			   "failed. %s\n", __func__, sock, strerror(errno));
 		return;
+	}
-	os_memset(&eloop.epoll_table[sock], 0, sizeof(struct eloop_sock));
+	os_memset(&eloop.fd_table[sock], 0, sizeof(struct eloop_sock));
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	EV_SET(&ke, sock, 0, EV_DELETE, 0, 0, NULL);
 	if (kevent(eloop.kqueuefd, &ke, 1, NULL, 0, NULL) == -1) {
 		wpa_printf(MSG_ERROR, "%s: kevent(DEL) for fd=%d "
 			   "failed. %s\n", __func__, sock, strerror(errno));
 		return;
+	}
 	os_memset(&eloop.fd_table[sock], 0, sizeof(struct eloop_sock));
 #endif /* CONFIG_ELOOP_KQUEUE */
+}
 #ifdef CONFIG_ELOOP_POLL
 static struct pollfd * find_pollfd(struct pollfd **pollfds_map, int fd, int mx)
+{
 	if (fd < mx && fd >= 0)
 		return pollfds_map[fd];
 	return NULL;
+}
 @@ -508,36 +586,52 @@ static void eloop_sock_table_dispatch(st
+	}
+}
 #endif /* CONFIG_ELOOP_SELECT */
 #ifdef CONFIG_ELOOP_EPOLL
 static void eloop_sock_table_dispatch(struct epoll_event *events, int nfds)
+{
 	struct eloop_sock *table;
 	int i;
 	for (i = 0; i < nfds; i++) {
-		table = &eloop.epoll_table[events[i].data.fd];
+		table = &eloop.fd_table[events[i].data.fd];
 		if (table->handler == NULL)
 			continue;
 		table->handler(table->sock, table->eloop_data,
 			       table->user_data);
+	}
+}
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 static void eloop_sock_table_dispatch(struct kevent *events, int nfds)
+{
 	struct eloop_sock *table;
 	int i;
 	for (i = 0; i < nfds; i++) {
 		table = &eloop.fd_table[events[i].ident];
 		if (table->handler == NULL)
 			continue;
 		table->handler(table->sock, table->eloop_data,
 			       table->user_data);
+	}
+}
 #endif /* CONFIG_ELOOP_KQUEUE */
 static void eloop_sock_table_destroy(struct eloop_sock_table *table)
+{
 	if (table) {
 		int i;
 		for (i = 0; i < table->count && table->table; i++) {
 			wpa_printf(MSG_INFO, "ELOOP: remaining socket: "
 				   "sock=%d eloop_data=%p user_data=%p "
 				   "handler=%p",
 				   table->table[i].sock,
 				   table->table[i].eloop_data,
 				   table->table[i].user_data,
 				   table->table[i].handler);
 			wpa_trace_dump_funcname("eloop unregistered socket "
 @@ -898,26 +992,29 @@ int eloop_register_signal_reconfig(eloop
 void eloop_run(void)
+{
 #ifdef CONFIG_ELOOP_POLL
 	int num_poll_fds;
 	int timeout_ms = 0;
 #endif /* CONFIG_ELOOP_POLL */
 #ifdef CONFIG_ELOOP_SELECT
 	fd_set *rfds, *wfds, *efds;
 	struct timeval _tv;
 #endif /* CONFIG_ELOOP_SELECT */
 #ifdef CONFIG_ELOOP_EPOLL
 	int timeout_ms = -1;
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	struct timespec ts;
 #endif /* CONFIG_ELOOP_KQUEUE */
 	int res;
 	struct os_reltime tv, now;
 #ifdef CONFIG_ELOOP_SELECT
 	rfds = os_malloc(sizeof(*rfds));
 	wfds = os_malloc(sizeof(*wfds));
 	efds = os_malloc(sizeof(*efds));
 	if (rfds == NULL || wfds == NULL || efds == NULL)
 		goto out;
 #endif /* CONFIG_ELOOP_SELECT */
 	while (!eloop.terminate &&
 	       (!dl_list_empty(&eloop.timeout) || eloop.readers.count > 0 ||
 @@ -928,62 +1025,79 @@ void eloop_run(void)
 		if (timeout) {
 			os_get_reltime(&now);
 			if (os_reltime_before(&now, &timeout->time))
 				os_reltime_sub(&timeout->time, &now, &tv);
 			else
 				tv.sec = tv.usec = 0;
 #if defined(CONFIG_ELOOP_POLL) || defined(CONFIG_ELOOP_EPOLL)
 			timeout_ms = tv.sec * 1000 + tv.usec / 1000;
 #endif /* defined(CONFIG_ELOOP_POLL) || defined(CONFIG_ELOOP_EPOLL) */
 #ifdef CONFIG_ELOOP_SELECT
 			_tv.tv_sec = tv.sec;
 			_tv.tv_usec = tv.usec;
 #endif /* CONFIG_ELOOP_SELECT */
 #ifdef CONFIG_ELOOP_KQUEUE
 			ts.tv_sec = tv.sec;
 			ts.tv_nsec = tv.usec * 1000L;
 #endif /* CONFIG_ELOOP_KQUEUE */
+		}
 #ifdef CONFIG_ELOOP_POLL
 		num_poll_fds = eloop_sock_table_set_fds(
 			&eloop.readers, &eloop.writers, &eloop.exceptions,
 			eloop.pollfds, eloop.pollfds_map,
 			eloop.max_pollfd_map);
 		res = poll(eloop.pollfds, num_poll_fds,
 			   timeout ? timeout_ms : -1);
 #endif /* CONFIG_ELOOP_POLL */
 #ifdef CONFIG_ELOOP_SELECT
 		eloop_sock_table_set_fds(&eloop.readers, rfds);
 		eloop_sock_table_set_fds(&eloop.writers, wfds);
 		eloop_sock_table_set_fds(&eloop.exceptions, efds);
 		res = select(eloop.max_sock + 1, rfds, wfds, efds,
 			     timeout ? &_tv : NULL);
 #endif /* CONFIG_ELOOP_SELECT */
 #ifdef CONFIG_ELOOP_EPOLL
 		if (eloop.count == 0) {
 			res = 0;
 		} else {
 			res = epoll_wait(eloop.epollfd, eloop.epoll_events,
 					 eloop.count, timeout_ms);
+		}
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 		if (eloop.count == 0) {
 			res = 0;
 		} else {
 			res = kevent(eloop.kqueuefd, NULL, 0,
 				     eloop.kqueue_events, eloop.kqueue_nevents,
 				     timeout ? &ts : NULL);
+		}
 #endif /* CONFIG_ELOOP_KQUEUE */
 		if (res < 0 && errno != EINTR && errno != 0) {
 			wpa_printf(MSG_ERROR, "eloop: %s: %s",
 #ifdef CONFIG_ELOOP_POLL
 				   "poll"
 #endif /* CONFIG_ELOOP_POLL */
 #ifdef CONFIG_ELOOP_SELECT
 				   "select"
 #endif /* CONFIG_ELOOP_SELECT */
 #ifdef CONFIG_ELOOP_EPOLL
 				   "epoll"
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 				   "kqueue"
 #endif /* CONFIG_ELOOP_EKQUEUE */
 				   , strerror(errno));
 			goto out;
+		}
 		eloop_process_pending_signals();
 		/* check if some registered timeouts have occurred */
 		timeout = dl_list_first(&eloop.timeout, struct eloop_timeout,
 					list);
 		if (timeout) {
 			os_get_reltime(&now);
 			if (!os_reltime_before(&now, &timeout->time)) {
 				void *eloop_data = timeout->eloop_data;
 				void *user_data = timeout->user_data;
 @@ -1001,26 +1115,29 @@ void eloop_run(void)
 #ifdef CONFIG_ELOOP_POLL
 		eloop_sock_table_dispatch(&eloop.readers, &eloop.writers,
 					  &eloop.exceptions, eloop.pollfds_map,
 					  eloop.max_pollfd_map);
 #endif /* CONFIG_ELOOP_POLL */
 #ifdef CONFIG_ELOOP_SELECT
 		eloop_sock_table_dispatch(&eloop.readers, rfds);
 		eloop_sock_table_dispatch(&eloop.writers, wfds);
 		eloop_sock_table_dispatch(&eloop.exceptions, efds);
 #endif /* CONFIG_ELOOP_SELECT */
 #ifdef CONFIG_ELOOP_EPOLL
 		eloop_sock_table_dispatch(eloop.epoll_events, res);
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 		eloop_sock_table_dispatch(eloop.kqueue_events, res);
 #endif /* CONFIG_ELOOP_KQUEUE */
+	}
 	eloop.terminate = 0;
 out:
 #ifdef CONFIG_ELOOP_SELECT
 	os_free(rfds);
 	os_free(wfds);
 	os_free(efds);
 #endif /* CONFIG_ELOOP_SELECT */
 	return;
+}
 @@ -1053,31 +1170,37 @@ void eloop_destroy(void)
 					timeout->handler);
 		wpa_trace_dump("eloop timeout", timeout);
 		eloop_remove_timeout(timeout);
+	}
 	eloop_sock_table_destroy(&eloop.readers);
 	eloop_sock_table_destroy(&eloop.writers);
 	eloop_sock_table_destroy(&eloop.exceptions);
 	os_free(eloop.signals);
 #ifdef CONFIG_ELOOP_POLL
 	os_free(eloop.pollfds);
 	os_free(eloop.pollfds_map);
 #endif /* CONFIG_ELOOP_POLL */
 #if defined(CONFIG_ELOOP_EPOLL) || defined(CONFIG_ELOOP_KQUEUE)
 	os_free(eloop.fd_table);
 #endif
 #ifdef CONFIG_ELOOP_EPOLL
 	os_free(eloop.epoll_table);
 	os_free(eloop.epoll_events);
 	close(eloop.epollfd);
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	os_free(eloop.kqueue_events);
 	close(eloop.kqueuefd);
 #endif /* CONFIG_ELOOP_KQUEUE */
+}
 int eloop_terminated(void)
+{
 	return eloop.terminate;
+}
 void eloop_wait_for_read_sock(int sock)
+{
 #ifdef CONFIG_ELOOP_POLL
 	struct pollfd pfd;
 @@ -1096,18 +1219,29 @@ void eloop_wait_for_read_sock(int sock)
 	 * We can use epoll() here. But epoll() requres 4 system calls.
 	 * epoll_create1(), epoll_ctl() for ADD, epoll_wait, and close() for
 	 * epoll fd. So select() is better for performance here.
 	 */
 	fd_set rfds;
 	if (sock < 0)
 		return;
 	FD_ZERO(&rfds);
 	FD_SET(sock, &rfds);
 	select(sock + 1, &rfds, NULL, NULL, NULL);
 #endif /* defined(CONFIG_ELOOP_SELECT) || defined(CONFIG_ELOOP_EPOLL) */
 #ifdef CONFIG_ELOOP_KQUEUE
 	int kfd;
 	struct kevent ke1, ke2;
 	kfd = kqueue();
 	if (kfd == -1)
 		return;
 	EV_SET(&ke1, sock, EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, NULL);
 	kevent(kfd, &ke1, 1, &ke2, 1, NULL);
 	close(kfd);
 #endif /* CONFIG_ELOOP_KQUEUE */
+}
 #ifdef CONFIG_ELOOP_SELECT
 #undef CONFIG_ELOOP_SELECT
 #endif /* CONFIG_ELOOP_SELECT */