From fe8d2ba72f1b7e0a49fdfa61f0f622989fe58b4c Mon Sep 17 00:00:00 2001
From: Dirk Ziegelmeier <dirk@ziegelmeier.net>
Date: Mon, 22 Feb 2016 21:00:00 +0100
Subject: [PATCH] Eliminate tcpip_pppos_input function

---
 src/api/tcpip.c                    | 18 ------------------
 src/include/lwip/priv/tcpip_priv.h |  4 ----
 src/netif/ppp/pppos.c              |  3 ++-
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/api/tcpip.c b/src/api/tcpip.c
index 284fceaa..5394cf06 100644
--- a/src/api/tcpip.c
+++ b/src/api/tcpip.c
@@ -49,8 +49,6 @@
 #include "lwip/init.h"
 #include "lwip/ip.h"
 #include "netif/etharp.h"
-#include "netif/ppp/pppoe.h"
-#include "netif/ppp/pppos.h"
 
 #define TCPIP_MSG_VAR_REF(name)     API_VAR_REF(name)
 #define TCPIP_MSG_VAR_DECLARE(name) API_VAR_DECLARE(struct tcpip_msg, name)
@@ -223,22 +221,6 @@ tcpip_input(struct pbuf *p, struct netif *inp)
   return tcpip_inpkt(p, inp, ip_input);
 }
 
-#if PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE
-/**
- * Pass a received packet to tcpip_thread for input processing
- *
- * @param p the received packet, p->payload pointing to the Ethernet header or
- *          to an IP header (if inp doesn't have NETIF_FLAG_ETHARP or
- *          NETIF_FLAG_ETHERNET flags)
- * @param inp the network interface on which the packet was received
- */
-err_t
-tcpip_pppos_input(struct pbuf *p, struct netif *inp)
-{
-  return tcpip_inpkt(p, inp, pppos_input_sys);
-}
-#endif /* PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE */
-
 /**
  * Call a specific function in the thread context of
  * tcpip_thread for easy access synchronization.
diff --git a/src/include/lwip/priv/tcpip_priv.h b/src/include/lwip/priv/tcpip_priv.h
index 61ec2817..2208b3a2 100644
--- a/src/include/lwip/priv/tcpip_priv.h
+++ b/src/include/lwip/priv/tcpip_priv.h
@@ -136,10 +136,6 @@ extern sys_mutex_t lock_tcpip_core;
 err_t tcpip_apimsg(struct api_msg *apimsg);
 #endif /* LWIP_NETCONN || LWIP_SOCKET */
 
-#if PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE
-err_t tcpip_pppos_input(struct pbuf *p, struct netif *inp);
-#endif /* PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE */
-
 #if LWIP_NETIF_API
 err_t tcpip_netifapi(struct netifapi_msg *netifapimsg);
 #if LWIP_TCPIP_CORE_LOCKING
diff --git a/src/netif/ppp/pppos.c b/src/netif/ppp/pppos.c
index 8e7fcea4..b24e7fa6 100644
--- a/src/netif/ppp/pppos.c
+++ b/src/netif/ppp/pppos.c
@@ -444,7 +444,7 @@ pppos_input_tcpip(ppp_pcb *ppp, u8_t *s, int l)
   }
   pbuf_take(p, s, l);
 
-  err = tcpip_pppos_input(p, ppp_netif(ppp));
+  err = tcpip_inpkt(p, ppp_netif(ppp), pppos_input_sys);
   if (err != ERR_OK) {
      pbuf_free(p);
   }
@@ -895,4 +895,5 @@ failed:
   pbuf_free(nb);
   return err;
 }
+
 #endif /* PPP_SUPPORT && PPPOS_SUPPORT */