From bb908366a5abe5c6daa5eb0b432a44a0f8d30ff8 Mon Sep 17 00:00:00 2001
From: Dirk Ziegelmeier <dirk@ziegelmeier.net>
Date: Mon, 25 Apr 2016 20:08:21 +0200
Subject: [PATCH] More PPP cleanups

---
 src/core/memp.c                  |  1 +
 src/include/lwip/opt.h           | 39 --------------------------------
 src/include/netif/ppp/ppp_opts.h | 39 ++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/core/memp.c b/src/core/memp.c
index 1fa42429..8a8a4e23 100644
--- a/src/core/memp.c
+++ b/src/core/memp.c
@@ -64,6 +64,7 @@
 #include "lwip/priv/tcpip_priv.h"
 #include "lwip/netifapi.h"
 
+/* needed by MEMP_NUM_SYS_TIMEOUT */
 #include "netif/ppp/ppp_opts.h"
 
 #include <string.h>
diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index 53260f9c..79f69653 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -366,38 +366,6 @@
 #define MEMP_NUM_LOCALHOSTLIST          1
 #endif
 
-/**
- * MEMP_NUM_PPP_PCB: the number of simultaneously active PPP
- * connections (requires the PPP_SUPPORT option)
- */
-#ifndef MEMP_NUM_PPP_PCB
-#define MEMP_NUM_PPP_PCB       1
-#endif
-
-/**
- * MEMP_NUM_PPPOS_INTERFACES: the number of concurrently active PPPoS
- * interfaces (only used with PPPOS_SUPPORT==1)
- */
-#ifndef MEMP_NUM_PPPOS_INTERFACES
-#define MEMP_NUM_PPPOS_INTERFACES       MEMP_NUM_PPP_PCB
-#endif
-
-/**
- * MEMP_NUM_PPPOE_INTERFACES: the number of concurrently active PPPoE
- * interfaces (only used with PPPOE_SUPPORT==1)
- */
-#ifndef MEMP_NUM_PPPOE_INTERFACES
-#define MEMP_NUM_PPPOE_INTERFACES       1
-#endif
-
-/**
- * MEMP_NUM_PPPOL2TP_INTERFACES: the number of concurrently active PPPoL2TP
- * interfaces (only used with PPPOL2TP_SUPPORT==1)
- */
-#ifndef MEMP_NUM_PPPOL2TP_INTERFACES
-#define MEMP_NUM_PPPOL2TP_INTERFACES       1
-#endif
-
 /**
  * PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
  */
@@ -2456,13 +2424,6 @@
 #define TCPIP_DEBUG                     LWIP_DBG_OFF
 #endif
 
-/**
- * PPP_DEBUG: Enable debugging for PPP.
- */
-#ifndef PPP_DEBUG
-#define PPP_DEBUG                       LWIP_DBG_OFF
-#endif
-
 /**
  * SLIP_DEBUG: Enable debugging in slipif.c.
  */
diff --git a/src/include/netif/ppp/ppp_opts.h b/src/include/netif/ppp/ppp_opts.h
index 95ac2b3f..edde26fb 100644
--- a/src/include/netif/ppp/ppp_opts.h
+++ b/src/include/netif/ppp/ppp_opts.h
@@ -74,6 +74,45 @@
 
 #if PPP_SUPPORT
 
+/**
+ * MEMP_NUM_PPP_PCB: the number of simultaneously active PPP
+ * connections (requires the PPP_SUPPORT option)
+ */
+#ifndef MEMP_NUM_PPP_PCB
+#define MEMP_NUM_PPP_PCB       1
+#endif
+
+/**
+ * MEMP_NUM_PPPOS_INTERFACES: the number of concurrently active PPPoS
+ * interfaces (only used with PPPOS_SUPPORT==1)
+ */
+#ifndef MEMP_NUM_PPPOS_INTERFACES
+#define MEMP_NUM_PPPOS_INTERFACES       MEMP_NUM_PPP_PCB
+#endif
+
+/**
+ * MEMP_NUM_PPPOE_INTERFACES: the number of concurrently active PPPoE
+ * interfaces (only used with PPPOE_SUPPORT==1)
+ */
+#ifndef MEMP_NUM_PPPOE_INTERFACES
+#define MEMP_NUM_PPPOE_INTERFACES       1
+#endif
+
+/**
+ * MEMP_NUM_PPPOL2TP_INTERFACES: the number of concurrently active PPPoL2TP
+ * interfaces (only used with PPPOL2TP_SUPPORT==1)
+ */
+#ifndef MEMP_NUM_PPPOL2TP_INTERFACES
+#define MEMP_NUM_PPPOL2TP_INTERFACES       1
+#endif
+
+/**
+ * PPP_DEBUG: Enable debugging for PPP.
+ */
+#ifndef PPP_DEBUG
+#define PPP_DEBUG                       LWIP_DBG_OFF
+#endif
+
 /**
  * PPP_INPROC_IRQ_SAFE==1 call pppos_input() using tcpip_callback().
  *