From 4171f39a72ed15cb394f7cb9b909c5b3a2068580 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Fri, 5 May 2017 15:42:06 +0200
Subject: [PATCH] PPP: remove ppp_singlebuf

We don't have to keep a helper function just for the sake of a PBUF_RAW
constant. Inline ppp_singlebuf function.

Signed-off-by: Sylvain Rochet <gradator@gradator.net>
---
 src/include/netif/ppp/ppp_impl.h | 3 ---
 src/netif/ppp/ppp.c              | 7 +------
 src/netif/ppp/pppoe.c            | 2 +-
 src/netif/ppp/pppol2tp.c         | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/include/netif/ppp/ppp_impl.h b/src/include/netif/ppp/ppp_impl.h
index 1d4c7742..d63db0b6 100644
--- a/src/include/netif/ppp/ppp_impl.h
+++ b/src/include/netif/ppp/ppp_impl.h
@@ -406,9 +406,6 @@ void ppp_link_end(ppp_pcb *pcb);
 /* function called to process input packet */
 void ppp_input(ppp_pcb *pcb, struct pbuf *pb);
 
-/* helper function, merge a pbuf chain into one pbuf */
-struct pbuf *ppp_singlebuf(struct pbuf *p);
-
 
 /*
  * Functions called by PPP protocols.
diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c
index 20e42669..4b0eb6c1 100644
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -923,7 +923,7 @@ void ppp_input(ppp_pcb *pcb, struct pbuf *pb) {
        */
       for (i = 0; (protp = protocols[i]) != NULL; ++i) {
         if (protp->protocol == protocol) {
-          pb = ppp_singlebuf(pb);
+          pb = pbuf_coalesce(pb, PBUF_RAW);
           (*protp->input)(pcb, (u8_t*)pb->payload, pb->len);
           goto out;
         }
@@ -971,11 +971,6 @@ out:
   pbuf_free(pb);
 }
 
-/* merge a pbuf chain into one pbuf */
-struct pbuf *ppp_singlebuf(struct pbuf *p) {
-  return pbuf_coalesce(p, PBUF_RAW);
-}
-
 /*
  * Write a pbuf to a ppp link, only used from PPP functions
  * to send PPP packets.
diff --git a/src/netif/ppp/pppoe.c b/src/netif/ppp/pppoe.c
index ddd7c3e2..68e9e84b 100644
--- a/src/netif/ppp/pppoe.c
+++ b/src/netif/ppp/pppoe.c
@@ -394,7 +394,7 @@ pppoe_disc_input(struct netif *netif, struct pbuf *pb)
     return;
   }
 
-  pb = ppp_singlebuf(pb);
+  pb = pbuf_coalesce(pb, PBUF_RAW);
 
   if (pb->len < sizeof(*ethhdr)) {
     goto done;
diff --git a/src/netif/ppp/pppol2tp.c b/src/netif/ppp/pppol2tp.c
index 02278299..742aaa3c 100644
--- a/src/netif/ppp/pppol2tp.c
+++ b/src/netif/ppp/pppol2tp.c
@@ -507,7 +507,7 @@ static void pppol2tp_dispatch_control_packet(pppol2tp_pcb *l2tp, u16_t port, str
     return;
   }
 
-  p = ppp_singlebuf(p);
+  p = pbuf_coalesce(p, PBUF_RAW);
   inp = (u8_t*)p->payload;
   /* Decode AVPs */
   while (p->len > 0) {