From f946abd86b2a10afe124b812e3265f787061f423 Mon Sep 17 00:00:00 2001
From: jani <jani>
Date: Thu, 19 Dec 2002 09:50:53 +0000
Subject: [PATCH] Simplify pbuf allocation for TCP packets in two places by
 replacing pbuf_alloc + pbuf_header with an equivalent pbuf_alloc.When we know
 we'll have to adjust the payload for the TCP header just alloc it like that
 from the start.

---
 src/core/tcp_out.c | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c
index 36bb7462..9963ae3f 100644
--- a/src/core/tcp_out.c
+++ b/src/core/tcp_out.c
@@ -344,21 +344,12 @@ tcp_output(struct tcp_pcb *pcb)
      (seg == NULL ||
       ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len > wnd)) {
     pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW);
-    p = pbuf_alloc(PBUF_TRANSPORT, 0, PBUF_RAM);
+    p = pbuf_alloc(PBUF_IP, TCP_HLEN, PBUF_RAM);
     if(p == NULL) {
       DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: (ACK) could not allocate pbuf\n"));
       return ERR_BUF;
     }
     DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: sending ACK for %lu\n", pcb->rcv_nxt));    
-    if(pbuf_header(p, TCP_HLEN)) {
-      DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: (ACK) no room for TCP header in pbuf.\n"));
-      
-#ifdef TCP_STATS
-      ++lwip_stats.tcp.err;
-#endif /* TCP_STATS */
-      pbuf_free(p);
-      return ERR_BUF;
-    }
     
     tcphdr = p->payload;
     tcphdr->src = htons(pcb->local_port);
@@ -509,20 +500,10 @@ tcp_rst(u32_t seqno, u32_t ackno,
 {
   struct pbuf *p;
   struct tcp_hdr *tcphdr;
-  p = pbuf_alloc(PBUF_TRANSPORT, 0, PBUF_RAM);
+  p = pbuf_alloc(PBUF_IP, TCP_HLEN, PBUF_RAM);
   if(p == NULL) {
-    if(p == NULL) {
       DEBUGF(TCP_DEBUG, ("tcp_rst: could not allocate memory for pbuf\n"));
       return;
-    }
-  }
-  if(pbuf_header(p, TCP_HLEN)) {
-    DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_rst: no room for TCP header in pbuf.\n"));
-
-#ifdef TCP_STATS
-    ++lwip_stats.tcp.err;
-#endif /* TCP_STATS */
-    return;
   }
 
   tcphdr = p->payload;