[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/16] l2tpv3: Drop l2tpv3_can_send
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 02/16] l2tpv3: Drop l2tpv3_can_send |
Date: |
Fri, 12 Jun 2015 13:57:27 +0100 |
From: Fam Zheng <address@hidden>
This callback is called by main loop before polling s->fd, if it returns
false, the fd will not be polled in this iteration.
This is redundant with checks inside read callback. After this patch,
the data will be copied from s->fd to s->msgvec when it arrives. If the
device can't receive, it will be queued to incoming_queue, and when the
device status changes, this queue will be flushed.
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net/l2tpv3.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index ed395dc..99d80b6 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -133,14 +133,12 @@ typedef struct NetL2TPV3State {
} NetL2TPV3State;
-static int l2tpv3_can_send(void *opaque);
static void net_l2tpv3_send(void *opaque);
static void l2tpv3_writable(void *opaque);
static void l2tpv3_update_fd_handler(NetL2TPV3State *s)
{
- qemu_set_fd_handler2(s->fd,
- s->read_poll ? l2tpv3_can_send : NULL,
+ qemu_set_fd_handler2(s->fd, NULL,
s->read_poll ? net_l2tpv3_send : NULL,
s->write_poll ? l2tpv3_writable : NULL,
s);
@@ -169,13 +167,6 @@ static void l2tpv3_writable(void *opaque)
qemu_flush_queued_packets(&s->nc);
}
-static int l2tpv3_can_send(void *opaque)
-{
- NetL2TPV3State *s = opaque;
-
- return qemu_can_send_packet(&s->nc);
-}
-
static void l2tpv3_send_completed(NetClientState *nc, ssize_t len)
{
NetL2TPV3State *s = DO_UPCAST(NetL2TPV3State, nc, nc);
--
2.4.2
- [Qemu-devel] [PULL 00/16] Net patches, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 02/16] l2tpv3: Drop l2tpv3_can_send,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 01/16] stubs: Add qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 03/16] netmap: Drop netmap_can_send, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 04/16] net/socket: Drop net_socket_can_send, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 05/16] tap: Drop tap_can_send, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 06/16] Change qemu_set_fd_handler2(..., NULL, ...) to qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 07/16] main-loop: Drop qemu_set_fd_handler2, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 08/16] alsaaudio: Remove unused error handling of qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 09/16] oss: Remove unused error handling of qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 10/16] xen_backend: Remove unused error handling of qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 11/16] event-notifier: Always return 0 for posix implementation, Stefan Hajnoczi, 2015/06/12