From 7739e5a85e5bb0da9364d481d8a5f10fb69b3411 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@cloudius-systems.com>
Date: Wed, 3 Sep 2014 11:59:46 +0300
Subject: [PATCH] net: tcp: handle trivial case of merge_out_of_order()

---
 net/tcp.hh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/tcp.hh b/net/tcp.hh
index 997ff8761b..45c6151ad7 100644
--- a/net/tcp.hh
+++ b/net/tcp.hh
@@ -397,6 +397,9 @@ void tcp<InetTraits>::connection_refused() {
 
 template <typename InetTraits>
 void tcp<InetTraits>::tcb::merge_out_of_order() {
+    if (_rcv.out_of_order.empty()) {
+        return;
+    }
     abort();
 }