From b31f6eb45f9ecc00e149a75b763b7cf4cd194dea Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Fri, 20 Feb 2015 20:51:37 +0100
Subject: [PATCH] PPP, PPPoE, removed PPPERR_ usage

Low level protocol callbacks are using err_t returns type,
don't use PPPERR_ on them.
---
 src/netif/ppp/pppoe.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/netif/ppp/pppoe.c b/src/netif/ppp/pppoe.c
index 811583ee..b10d2182 100644
--- a/src/netif/ppp/pppoe.c
+++ b/src/netif/ppp/pppoe.c
@@ -206,6 +206,7 @@ ppp_pcb *pppoe_create(struct netif *pppif,
 static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
   struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
   struct pbuf *ph; /* Ethernet + PPPoE header */
+  err_t ret;
 #if LWIP_SNMP
   u16_t tot_len;
 #endif /* LWIP_SNMP */
@@ -219,7 +220,7 @@ static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
     LINK_STATS_INC(link.proterr);
     snmp_inc_ifoutdiscards(ppp->netif);
     pbuf_free(p);
-    return PPPERR_ALLOC;
+    return ERR_MEM;
   }
 
   pbuf_header(ph, -(s16_t)PPPOE_HEADERLEN); /* hide PPPoE header */
@@ -230,16 +231,17 @@ static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
 
   ppp->last_xmit = sys_jiffies();
 
-  if(pppoe_xmit(sc, ph) != ERR_OK) {
+  ret = pppoe_xmit(sc, ph);
+  if (ret != ERR_OK) {
     LINK_STATS_INC(link.err);
     snmp_inc_ifoutdiscards(ppp->netif);
-    return PPPERR_DEVICE;
+    return ret;
   }
 
   snmp_add_ifoutoctets(ppp->netif, (u16_t)tot_len);
   snmp_inc_ifoutucastpkts(ppp->netif);
   LINK_STATS_INC(link.xmit);
-  return PPPERR_NONE;
+  return ERR_OK;
 }
 
 /* Called by PPP core */