[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-3.2 36/41] slirp: remove dead TCP_ACK_HACK code
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH for-3.2 36/41] slirp: remove dead TCP_ACK_HACK code |
Date: |
Wed, 14 Nov 2018 16:36:38 +0400 |
Untouched since original introduction in 2004.
Signed-off-by: Marc-André Lureau <address@hidden>
---
slirp/tcp_input.c | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index de4ef92aba..0d34abf8d7 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -60,27 +60,6 @@
* Set DELACK for segments received in order, but ack immediately
* when segments are out of order (so fast retransmit can work).
*/
-#ifdef TCP_ACK_HACK
-#define TCP_REASS(tp, ti, m, so, flags) {\
- if ((ti)->ti_seq == (tp)->rcv_nxt && \
- tcpfrag_list_empty(tp) && \
- (tp)->t_state == TCPS_ESTABLISHED) {\
- if (ti->ti_flags & TH_PUSH) \
- tp->t_flags |= TF_ACKNOW; \
- else \
- tp->t_flags |= TF_DELACK; \
- (tp)->rcv_nxt += (ti)->ti_len; \
- flags = (ti)->ti_flags & TH_FIN; \
- if (so->so_emu) { \
- if (tcp_emu((so),(m))) sbappend((so), (m)); \
- } else \
- sbappend((so), (m)); \
- } else {\
- (flags) = tcp_reass((tp), (ti), (m)); \
- tp->t_flags |= TF_ACKNOW; \
- } \
-}
-#else
#define TCP_REASS(tp, ti, m, so, flags) { \
if ((ti)->ti_seq == (tp)->rcv_nxt && \
tcpfrag_list_empty(tp) && \
@@ -97,7 +76,7 @@
tp->t_flags |= TF_ACKNOW; \
} \
}
-#endif
+
static void tcp_dooptions(struct tcpcb *tp, u_char *cp, int cnt,
struct tcpiphdr *ti);
static void tcp_xmit_timer(register struct tcpcb *tp, int rtt);
--
2.19.1.708.g4ede3d42df
- Re: [Qemu-devel] [PATCH for-3.2 29/41] slirp: improve a bit the debug macros, (continued)
- [Qemu-devel] [PATCH for-3.2 33/41] slirp: replace qemu_notify_event() with a callback, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 34/41] slirp: remove #if notdef dead code, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 35/41] slirp: NULL is defined by glib (at least), Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 36/41] slirp: remove dead TCP_ACK_HACK code,
Marc-André Lureau <=
- [Qemu-devel] [PATCH for-3.2 37/41] slirp: replace ARRAY_SIZE with G_N_ELEMENTS, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 38/41] net: do not depend on slirp internals, Marc-André Lureau, 2018/11/14