| Message ID | 20181114123643.24091-37-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | RFC: slirp: make it again a standalone project | expand |
On Wed, Nov 14, 2018 at 04:36:38PM +0400, Marc-André Lureau wrote: > Untouched since original introduction in 2004. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > slirp/tcp_input.c | 23 +---------------------- > 1 file changed, 1 insertion(+), 22 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
Daniel P. Berrangé, le mer. 14 nov. 2018 14:12:06 +0000, a ecrit: > On Wed, Nov 14, 2018 at 04:36:38PM +0400, Marc-André Lureau wrote: > > Untouched since original introduction in 2004. > > > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > --- > > slirp/tcp_input.c | 23 +---------------------- > > 1 file changed, 1 insertion(+), 22 deletions(-) > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Applied to my tree, thanks!
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);
Untouched since original introduction in 2004. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- slirp/tcp_input.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-)