From 8a8cba75a2ed1e384de7bb6361a34e6ddfd46d1f Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Tue, 17 Feb 2015 23:02:18 +0100
Subject: [PATCH] PPP, lower protocols, chained returns from local functions to
 callback caller

PPPoS,PPPoE,PPPoL2TP functions using non-void returns are now propagated
to callback caller (PPP core).
---
 src/netif/ppp/pppoe.c    | 6 ++----
 src/netif/ppp/pppol2tp.c | 6 ++----
 src/netif/ppp/pppos.c    | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/netif/ppp/pppoe.c b/src/netif/ppp/pppoe.c
index ade85111..77a6d69a 100644
--- a/src/netif/ppp/pppoe.c
+++ b/src/netif/ppp/pppoe.c
@@ -195,16 +195,14 @@ static int pppoe_link_command_callback(void *pcb, u8_t command) {
 
   switch(command) {
   case PPP_LINK_COMMAND_CONNECT:
-    pppoe_connect(sc);
-    break;
+    return pppoe_connect(sc);
 
   case PPP_LINK_COMMAND_DISCONNECT:
     pppoe_disconnect(sc);
     break;
 
   case PPP_LINK_COMMAND_FREE:
-    pppoe_destroy(sc);
-    break;
+    return pppoe_destroy(sc);
 
   default: ;
   }
diff --git a/src/netif/ppp/pppol2tp.c b/src/netif/ppp/pppol2tp.c
index 04cea64b..08dd0e12 100644
--- a/src/netif/ppp/pppol2tp.c
+++ b/src/netif/ppp/pppol2tp.c
@@ -148,16 +148,14 @@ static int pppol2tp_link_command_callback(void *pcb, u8_t command) {
 
   switch(command) {
   case PPP_LINK_COMMAND_CONNECT:
-    pppol2tp_connect(l2tp);
-    break;
+    return pppol2tp_connect(l2tp);
 
   case PPP_LINK_COMMAND_DISCONNECT:
     pppol2tp_disconnect(l2tp);
     break;
 
   case PPP_LINK_COMMAND_FREE:
-    pppol2tp_destroy(l2tp);
-    break;
+    return pppol2tp_destroy(l2tp);
 
   default: ;
   }
diff --git a/src/netif/ppp/pppos.c b/src/netif/ppp/pppos.c
index 7a53b59a..da38537d 100644
--- a/src/netif/ppp/pppos.c
+++ b/src/netif/ppp/pppos.c
@@ -191,8 +191,7 @@ pppos_link_command_callback(void *pcb, u8_t command)
     break;
 
   case PPP_LINK_COMMAND_FREE:
-    pppos_destroy(pppos);
-    break;
+    return pppos_destroy(pppos);
 
   default: ;
   }