Author: cgutman
Date: Wed Sep 30 01:14:21 2009
New Revision: 43228
URL: http://svn.reactos.org/svn/reactos?rev=43228&view=rev
Log:
- Sync the ACK hack with the last oskit release
Modified:
trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c
Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c?rev=43228&r1=43227&r2=43228&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1]
(original)
+++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] Wed
Sep 30 01:14:21 2009
@@ -84,7 +84,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 && \
(tp)->seg_next == (struct tcpiphdr *)(tp) && \
@@ -104,24 +103,6 @@
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 @@
*/
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 @@
} else {
tp->t_flags |= TF_DELACK;
}
-#else
- tp->t_flags |= TF_DELACK;
-#endif
return;
}
}
