- Sync the ACK hack with the last oskit release

[reactos.git] / reactos / lib / drivers / oskittcp / oskittcp / tcp_input.c

diff --git a/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c b/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c
index 248b8bc..175cea4 100644 (file)
--- a/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c
+++ b/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c
@@ -84,7 +84,6 @@ struct inpcbinfo tcbinfo;
  * 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 && \
            (tp)->seg_next == (struct tcpiphdr *)(tp) && \
@@ -104,24 +103,6 @@ struct inpcbinfo tcbinfo;
                tp->t_flags |= TF_ACKNOW; \
        } \
 }
-#else
-#define        TCP_REASS(tp, ti, m, so, flags) { \
-       if ((ti)->ti_seq == (tp)->rcv_nxt && \
-           (tp)->seg_next == (struct tcpiphdr *)(tp) && \
-           (tp)->t_state == TCPS_ESTABLISHED) { \
-               tp->t_flags |= TF_DELACK; \
-               (tp)->rcv_nxt += (ti)->ti_len; \
-               flags = (ti)->ti_flags & TH_FIN; \
-               tcpstat.tcps_rcvpack++;\
-               tcpstat.tcps_rcvbyte += (ti)->ti_len;\
-               sbappend(&(so)->so_rcv, (m)); \
-               sorwakeup(so); \
-       } else { \
-               (flags) = tcp_reass((tp), (ti), (m)); \
-               tp->t_flags |= TF_ACKNOW; \
-       } \
-}
-#endif
 #ifndef TUBA_INCLUDE
 
 int
@@ -592,7 +573,6 @@ findpcb:
                         */
                        sbappend(&so->so_rcv, m);
                        sorwakeup(so);
-#ifdef TCP_ACK_HACK
                        /*
                         * If this is a short packet, then ACK now - with Nagel
                         *      congestion avoidance sender won't send more until
@@ -604,9 +584,6 @@ findpcb:
                        } else {
                                tp->t_flags |= TF_DELACK;
                        }
-#else
-                       tp->t_flags |= TF_DELACK;
-#endif
                        return;
                }
        }