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

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2013-01-31 17:05:44 +01:00
parent bc6a230b50
commit f83b6548c7

View file

@ -21,8 +21,6 @@
#include <stdio.h> #include <stdio.h>
#include "ustream.h" #include "ustream.h"
static bool _init = false;
static void ustream_fd_set_uloop(struct ustream *s, bool write) static void ustream_fd_set_uloop(struct ustream *s, bool write)
{ {
struct ustream_fd *sf = container_of(s, struct ustream_fd, stream); 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; flags |= ULOOP_WRITE;
uloop_fd_add(&sf->fd, flags); 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) 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->write = ustream_fd_write;
s->free = ustream_fd_free; s->free = ustream_fd_free;
s->poll = ustream_fd_poll; s->poll = ustream_fd_poll;
_init = true;
ustream_fd_set_uloop(s, false); ustream_fd_set_uloop(s, false);
_init = false;
} }