ustream-fd: do not loop back into the callback from ustream_fd_set_uloop
authorFelix Fietkau <nbd@openwrt.org>
Thu, 31 Jan 2013 16:05:44 +0000 (17:05 +0100)
committerFelix Fietkau <nbd@openwrt.org>
Thu, 31 Jan 2013 16:08:40 +0000 (17:08 +0100)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
ustream-fd.c

index 6f8f561da0fb58bc44379c1f116ad4390c78b18d..c8f0ef9aa1b2aa4dca63a1eed1dbe9d91cf9b492 100644 (file)
@@ -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;
 }