From e7a2ab5de96bb8a7323f605db3d6cf1b00d92695 Mon Sep 17 00:00:00 2001
From: kieranm <kieranm>
Date: Tue, 31 Mar 2009 10:53:11 +0000
Subject: [PATCH] BUG26010: set push bit correctly when tcp segments are merged

---
 CHANGELOG          | 3 +++
 src/core/tcp_out.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1608863f..5732efba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -75,6 +75,9 @@ HISTORY
 
   ++ Bugfixes:
 
+  2009-03-31 Kieran Mansley
+  * tcp_out.c: set push bit correctly when tcp segments are merged
+
   2009-03-27 Kieran Mansley
   * tcp_out.c set window correctly on probes (correcting change made
     yesterday)
diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c
index 9f2e7f5e..4eb4086b 100644
--- a/src/core/tcp_out.c
+++ b/src/core/tcp_out.c
@@ -345,7 +345,8 @@ tcp_enqueue(struct tcp_pcb *pcb, void *arg, u16_t len,
 
     LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("tcp_enqueue: chaining segments, new len %"U16_F"\n", useg->len));
     if (seg == queue) {
-      seg = NULL;
+      seg = useg;
+      seglen = useg->len;
     }
     memp_free(MEMP_TCP_SEG, queue);
   }