From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 31 Jan 2013 16:05:44 +0000 (+0100)
Subject: ustream-fd: do not loop back into the callback from ustream_fd_set_uloop
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f83b6548c792a02998e3daf7a4fcecb6e36d4a8c;p=project%2Flibubox.git

ustream-fd: do not loop back into the callback from ustream_fd_set_uloop

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/ustream-fd.c b/ustream-fd.c
index 6f8f561..c8f0ef9 100644
--- a/ustream-fd.c
+++ b/ustream-fd.c
@@ -21,8 +21,6 @@
 #include <stdio.h>
 #include "ustream.h"
 
-static bool _init = false;
-
 static void ustream_fd_set_uloop(struct ustream *s, bool write)
 {
 	struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
@@ -37,9 +35,6 @@ static void ustream_fd_set_uloop(struct ustream *s, bool write)
 		flags |= ULOOP_WRITE;
 
 	uloop_fd_add(&sf->fd, flags);
-
-	if ((flags & ULOOP_READ) && !_init);
-		sf->fd.cb(&sf->fd, ULOOP_READ);
 }
 
 static void ustream_fd_set_read_blocked(struct ustream *s)
@@ -163,7 +158,5 @@ void ustream_fd_init(struct ustream_fd *sf, int fd)
 	s->write = ustream_fd_write;
 	s->free = ustream_fd_free;
 	s->poll = ustream_fd_poll;
-	_init = true;
 	ustream_fd_set_uloop(s, false);
-	_init = false;
 }