aboutsummaryrefslogtreecommitdiff
path: root/slirp/tcp_input.c
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2018-11-14 16:36:38 +0400
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2019-01-14 00:44:29 +0100
commit3a78c2f468e5458a7ce6658296b8af8019361ce6 (patch)
treeaa10449da7a452806176de518c7040db8fd8bd15 /slirp/tcp_input.c
parent3a600d111a41d93da5e9ca04954ab64bd5107f1d (diff)
downloadqemu-3a78c2f468e5458a7ce6658296b8af8019361ce6.zip
qemu-3a78c2f468e5458a7ce6658296b8af8019361ce6.tar.gz
qemu-3a78c2f468e5458a7ce6658296b8af8019361ce6.tar.bz2
slirp: remove dead TCP_ACK_HACK code
Untouched since original introduction in 2004. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'slirp/tcp_input.c')
-rw-r--r--slirp/tcp_input.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index 0f073d4..c4d7abf 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);