Replace PBUF_LINK_HLEN before PBUF_POOL_BUFSIZE, restore PPP options changed by Marc Boucher but lost with last Jared changes...

src/include/lwip/opt.h

@@ -1,3 +1,9 @@
+/**
+ * @file
+ *
+ * lwIP Options Configuration
+ */
+
 /*
  * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
@@ -661,6 +667,15 @@
    ---------- Pbuf options ----------
    ----------------------------------
 */
+/**
+ * PBUF_LINK_HLEN: the number of bytes that should be allocated for a
+ * link level header. The default is 14, the standard value for
+ * Ethernet.
+ */
+#ifndef PBUF_LINK_HLEN
+#define PBUF_LINK_HLEN                  14
+#endif
+
 /**
  * PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. The default is
  * designed to accomodate single full size TCP frame in one pbuf, including
@@ -671,15 +686,6 @@
 #define PBUF_POOL_BUFSIZE               LWIP_MEM_ALIGN_SIZE(TCP_MSS+40+PBUF_LINK_HLEN)
 #endif
 
-/**
- * PBUF_LINK_HLEN: the number of bytes that should be allocated for a
- * link level header. The default is 14, the standard value for
- * Ethernet.
- */
-#ifndef PBUF_LINK_HLEN
-#define PBUF_LINK_HLEN                  14
-#endif
-
 /*
    ------------------------------------------------
    ---------- Network Interfaces options ----------
@@ -982,12 +988,28 @@
 #define PPP_SUPPORT                     0
 #endif
 
+/**
+ * PPPOE_SUPPORT==1: Enable PPP Over Ethernet
+ */
+#ifndef PPPOE_SUPPORT
+#define PPPOE_SUPPORT                   0
+#endif
+
+/**
+ * PPPOS_SUPPORT==1: Enable PPP Over Serial
+ */
+#ifndef PPPOS_SUPPORT
+#define PPPOS_SUPPORT                   PPP_SUPPORT
+#endif
+
 #if PPP_SUPPORT
 
 /**
  * NUM_PPP: Max PPP sessions.
  */
+#ifndef NUM_PPP
 #define NUM_PPP                         1
+#endif
 
 /**
  * PAP_SUPPORT==1: Support PAP.
@@ -1006,17 +1028,23 @@
 /**
  * MSCHAP_SUPPORT==1: Support MSCHAP. CURRENTLY NOT SUPPORTED! DO NOT SET!
  */
+#ifndef MSCHAP_SUPPORT
 #define MSCHAP_SUPPORT                  0
+#endif
 
 /**
  * CBCP_SUPPORT==1: Support CBCP. CURRENTLY NOT SUPPORTED! DO NOT SET!
  */
+#ifndef CBCP_SUPPORT
 #define CBCP_SUPPORT                    0
+#endif
 
 /**
  * CCP_SUPPORT==1: Support CCP. CURRENTLY NOT SUPPORTED! DO NOT SET!
  */
+#ifndef CCP_SUPPORT
 #define CCP_SUPPORT                     0
+#endif
 
 /**
  * VJ_SUPPORT==1: Support VJ header compression.
@@ -1033,19 +1061,39 @@
 #endif
 
 /*
- * Timeouts.
+ * Timeouts
  */
+#ifndef FSM_DEFTIMEOUT
 #define FSM_DEFTIMEOUT                  6       /* Timeout time in seconds */
+#endif
+
+#ifndef FSM_DEFMAXTERMREQS
 #define FSM_DEFMAXTERMREQS              2       /* Maximum Terminate-Request transmissions */
+#endif
+
+#ifndef FSM_DEFMAXCONFREQS
 #define FSM_DEFMAXCONFREQS              10      /* Maximum Configure-Request transmissions */
+#endif
+
+#ifndef FSM_DEFMAXNAKLOOPS
 #define FSM_DEFMAXNAKLOOPS              5       /* Maximum number of nak loops */
+#endif
 
+#ifndef UPAP_DEFTIMEOUT
 #define UPAP_DEFTIMEOUT                 6       /* Timeout (seconds) for retransmitting req */
+#endif
+
+#ifndef UPAP_DEFREQTIME
 #define UPAP_DEFREQTIME                 30      /* Time to wait for auth-req from peer */
+#endif
 
+#ifndef CHAP_DEFTIMEOUT
 #define CHAP_DEFTIMEOUT                 6       /* Timeout time in seconds */
-#define CHAP_DEFTRANSMITS               10      /* max # times to send challenge */
+#endif
 
+#ifndef CHAP_DEFTRANSMITS
+#define CHAP_DEFTRANSMITS               10      /* max # times to send challenge */
+#endif
 
 /* Interval in seconds between keepalive echo requests, 0 to disable. */
 #ifndef LCP_ECHOINTERVAL
@@ -1053,10 +1101,14 @@
 #endif
 
 /* Number of unanswered echo requests before failure. */
+#ifndef LCP_MAXECHOFAILS
 #define LCP_MAXECHOFAILS                3
+#endif
 
 /* Max Xmit idle time (in jiffies) before resend flag char. */
+#ifndef PPP_MAXIDLEFLAG
 #define PPP_MAXIDLEFLAG                 100
+#endif
 
 /*
  * Packet sizes