From 224d5a9f33c3cb59422d94a28a9dc6d53ecb5097 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Thu, 23 Jun 2016 23:17:39 +0200
Subject: [PATCH] PPP, fix comment about opt.h (moved to ppp_opts.h)

PPP defines were moved from opt.h to ppp_opts.h but comments
referencing opt.h in PPP were not updated.
---
 src/include/netif/ppp/eap.h  | 4 ++--
 src/include/netif/ppp/fsm.h  | 4 ++--
 src/include/netif/ppp/lcp.h  | 8 ++++----
 src/include/netif/ppp/ppp.h  | 2 +-
 src/include/netif/ppp/upap.h | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/include/netif/ppp/eap.h b/src/include/netif/ppp/eap.h
index 22d83ad9..3ee9aaf8 100644
--- a/src/include/netif/ppp/eap.h
+++ b/src/include/netif/ppp/eap.h
@@ -148,12 +148,12 @@ typedef struct eap_state {
 /*
  * Timeouts.
  */
-#if 0 /* moved to opt.h */
+#if 0 /* moved to ppp_opts.h */
 #define	EAP_DEFTIMEOUT		3	/* Timeout (seconds) for rexmit */
 #define	EAP_DEFTRANSMITS	10	/* max # times to transmit */
 #define	EAP_DEFREQTIME		20	/* Time to wait for peer request */
 #define	EAP_DEFALLOWREQ		20	/* max # times to accept requests */
-#endif /* moved to opt.h */
+#endif /* moved to ppp_opts.h */
 
 void eap_authwithpeer(ppp_pcb *pcb, const char *localname);
 void eap_authpeer(ppp_pcb *pcb, const char *localname);
diff --git a/src/include/netif/ppp/fsm.h b/src/include/netif/ppp/fsm.h
index 5f0141ab..b6915d3b 100644
--- a/src/include/netif/ppp/fsm.h
+++ b/src/include/netif/ppp/fsm.h
@@ -150,12 +150,12 @@ typedef struct fsm_callbacks {
 /*
  * Timeouts.
  */
-#if 0 /* moved to opt.h */
+#if 0 /* moved to ppp_opts.h */
 #define DEFTIMEOUT	3	/* Timeout time in seconds */
 #define DEFMAXTERMREQS	2	/* Maximum Terminate-Request transmissions */
 #define DEFMAXCONFREQS	10	/* Maximum Configure-Request transmissions */
 #define DEFMAXNAKLOOPS	5	/* Maximum number of nak loops */
-#endif /* moved to opt.h */
+#endif /* moved to ppp_opts.h */
 
 
 /*
diff --git a/src/include/netif/ppp/lcp.h b/src/include/netif/ppp/lcp.h
index 8be7afdc..1a63f59b 100644
--- a/src/include/netif/ppp/lcp.h
+++ b/src/include/netif/ppp/lcp.h
@@ -90,11 +90,11 @@
 /* Value used as data for CI_CALLBACK option */
 #define CBCP_OPT	6	/* Use callback control protocol */
 
-#if 0 /* moved to opt.h */
+#if 0 /* moved to ppp_opts.h */
 #define DEFMRU	1500		/* Try for this */
 #define MINMRU	128		/* No MRUs below this */
 #define MAXMRU	16384		/* Normally limit MRU to this */
-#endif /* moved to opt.h */
+#endif /* moved to ppp_opts.h */
 
 /* An endpoint discriminator, used with multilink. */
 #define MAX_ENDP_LEN	20	/* maximum length of discriminator value */
@@ -159,11 +159,11 @@ void lcp_sprotrej(ppp_pcb *pcb, u_char *p, int len);    /* send protocol reject
 
 extern const struct protent lcp_protent;
 
-#if 0 /* moved to opt.h */
+#if 0 /* moved to ppp_opts.h */
 /* Default number of times we receive our magic number from the peer
    before deciding the link is looped-back. */
 #define DEFLOOPBACKFAIL	10
-#endif /* moved to opt.h */
+#endif /* moved to ppp_opts.h */
 
 #endif /* LCP_H */
 #endif /* PPP_SUPPORT */
diff --git a/src/include/netif/ppp/ppp.h b/src/include/netif/ppp/ppp.h
index 9ffc8b4e..c0e2b891 100644
--- a/src/include/netif/ppp/ppp.h
+++ b/src/include/netif/ppp/ppp.h
@@ -47,7 +47,7 @@
 #include "lwip/ip6_addr.h"
 #endif /* PPP_IPV6_SUPPORT */
 
-/* Disable non-working or rarely used PPP feature, so rarely that we don't want to bloat opt.h with them */
+/* Disable non-working or rarely used PPP feature, so rarely that we don't want to bloat ppp_opts.h with them */
 #ifndef PPP_OPTIONS
 #define PPP_OPTIONS         0
 #endif
diff --git a/src/include/netif/ppp/upap.h b/src/include/netif/ppp/upap.h
index 742b5828..7da792ec 100644
--- a/src/include/netif/ppp/upap.h
+++ b/src/include/netif/ppp/upap.h
@@ -88,10 +88,10 @@
 /*
  * Timeouts.
  */
-#if 0 /* moved to opt.h */
+#if 0 /* moved to ppp_opts.h */
 #define UPAP_DEFTIMEOUT	3	/* Timeout (seconds) for retransmitting req */
 #define UPAP_DEFREQTIME	30	/* Time to wait for auth-req from peer */
-#endif /* moved to opt.h */
+#endif /* moved to ppp_opts.h */
 
 /*
  * Each interface is described by upap structure.