[Qemu-devel] [PULL 40/65] slirp: remove dead TCP_ACK_HACK code

[Samuel Thibault]

From: Marc-André Lureau 

Untouched since original introduction in 2004.

Signed-off-by: Marc-André Lureau 
Reviewed-by: Daniel P. Berrangé 
Signed-off-by: Samuel Thibault 
---
 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 0f073d4b38..c4d7abf1fa 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
 #defineTCP_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.20.1

[Qemu-devel] [PULL 40/65] slirp: remove dead TCP_ACK_HACK code

[Samuel Thibault]

From: Marc-André Lureau 

Untouched since original introduction in 2004.

Signed-off-by: Marc-André Lureau 
Reviewed-by: Daniel P. Berrangé 
Signed-off-by: Samuel Thibault 
---
 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 0f073d4b38..c4d7abf1fa 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
 #defineTCP_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.20.1