dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone
4fe85b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4fe85b
From: Josef Bacik <jbacik@fb.com>
4fe85b
Date: Wed, 12 Aug 2015 08:16:22 -0700
4fe85b
Subject: [PATCH] tcp: ack when we get an OOO/lost packet
4fe85b
4fe85b
While adding tcp window scaling support I was finding that I'd get some packet
4fe85b
loss or reordering when transferring from large distances and grub would just
4fe85b
timeout.  This is because we weren't ack'ing when we got our OOO packet, so the
4fe85b
sender didn't know it needed to retransmit anything, so eventually it would fill
4fe85b
the window and stop transmitting, and we'd time out.  Fix this by ACK'ing when
4fe85b
we don't find our next sequence numbered packet.  With this fix I no longer time
4fe85b
out.  Thanks,
4fe85b
4fe85b
Signed-off-by: Josef Bacik <jbacik@fb.com>
4fe85b
---
4fe85b
 grub-core/net/tcp.c | 5 ++++-
4fe85b
 1 file changed, 4 insertions(+), 1 deletion(-)
4fe85b
4fe85b
diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
4fe85b
index 2077f5519b2..fa29a2afc6c 100644
4fe85b
--- a/grub-core/net/tcp.c
4fe85b
+++ b/grub-core/net/tcp.c
4fe85b
@@ -882,7 +882,10 @@ grub_net_recv_tcp_packet (struct grub_net_buff *nb,
4fe85b
 	  grub_priority_queue_pop (sock->pq);
4fe85b
 	}
4fe85b
       if (grub_be_to_cpu32 (tcph->seqnr) != sock->their_cur_seq)
4fe85b
-	return GRUB_ERR_NONE;
4fe85b
+	{
4fe85b
+	  ack (sock);
4fe85b
+	  return GRUB_ERR_NONE;
4fe85b
+	}
4fe85b
       while (1)
4fe85b
 	{
4fe85b
 	  nb_top_p = grub_priority_queue_top (sock->pq);