From b4fe72c4a2a28b816341a7f46b0510400aa3846a Mon Sep 17 00:00:00 2001 From: Sylvain Rochet Date: Sun, 15 Feb 2015 00:48:37 +0100 Subject: [PATCH] PPP: removed duplicated code in ppp_close() Looks like previous refactoring and cleaning made ppp_close() consistent for all our low level protocol backends, cleaned up duplicated code. --- src/netif/ppp/ppp.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c index b8e35cec..af7281ae 100644 --- a/src/netif/ppp/ppp.c +++ b/src/netif/ppp/ppp.c @@ -371,27 +371,9 @@ ppp_close(ppp_pcb *pcb) PPPDEBUG(LOG_DEBUG, ("ppp_close() called\n")); /* Disconnect */ -#if PPPOE_SUPPORT - if (pcb->pppoe_sc) { - PPPDEBUG(LOG_DEBUG, ("ppp_close: unit %d kill_link -> ppp_stop\n", pcb->num)); - /* This will leave us at PPP_PHASE_DEAD. */ - ppp_stop(pcb); - } else -#endif /* PPPOE_SUPPORT */ -#if PPPOL2TP_SUPPORT - if (pcb->l2tp_pcb) { - PPPDEBUG(LOG_DEBUG, ("ppp_close: unit %d kill_link -> ppp_stop\n", pcb->num)); - /* This will leave us at PPP_PHASE_DEAD. */ - ppp_stop(pcb); - } else -#endif /* PPPOL2TP_SUPPORT */ - { -#if PPPOS_SUPPORT - PPPDEBUG(LOG_DEBUG, ("ppp_close: unit %d kill_link -> ppp_stop\n", pcb->num)); - /* This will leave us at PPP_PHASE_DEAD. */ - ppp_stop(pcb); -#endif /* PPPOS_SUPPORT */ - } + PPPDEBUG(LOG_DEBUG, ("ppp_close: unit %d kill_link -> ppp_stop\n", pcb->num)); + /* This will leave us at PPP_PHASE_DEAD. */ + ppp_stop(pcb); return st; }