From 369e9fbf086552380c63f6c1ef838f08b9280254 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Wed, 24 Dec 2014 23:12:30 +0100
Subject: [PATCH] PPP, from PPPD upstream, Eliminate some unnecessary ifdefs

---
 src/include/netif/ppp/ipv6cp.h |  2 --
 src/netif/ppp/PPPD_FOLLOWUP    | 18 ++++++++++++++++++
 src/netif/ppp/ipcp.c           |  4 ++--
 src/netif/ppp/ipv6cp.c         |  7 +------
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/include/netif/ppp/ipv6cp.h b/src/include/netif/ppp/ipv6cp.h
index d6e28a8d..e6afddf1 100644
--- a/src/include/netif/ppp/ipv6cp.h
+++ b/src/include/netif/ppp/ipv6cp.h
@@ -163,9 +163,7 @@ typedef struct ipv6cp_options {
     unsigned int opt_remote     :1;  /* histoken set by option */
     unsigned int use_ip         :1;  /* use IP as interface identifier */
 #if 0
-#if defined(SOL2) || defined(__linux__)
     unsigned int use_persistent :1;  /* use uniquely persistent value for address */
-#endif /* defined(SOL2) */
 #endif
     unsigned int neg_vj         :1;  /* Van Jacobson Compression? */
     unsigned int                :1;  /* 1 bit of padding to round out to 8 bits */
diff --git a/src/netif/ppp/PPPD_FOLLOWUP b/src/netif/ppp/PPPD_FOLLOWUP
index a73cb291..7b359469 100644
--- a/src/netif/ppp/PPPD_FOLLOWUP
+++ b/src/netif/ppp/PPPD_FOLLOWUP
@@ -324,3 +324,21 @@ Low level serial port, not in the port.
   b04d2dc6df5c6b5650fea44250d58757ee3dac4a
 
 Reimplemented.
+
+
+2014-03-09 - pppol2tp: Connect up/down events to notifiers and add IPv6 ones
+  fafbe50251efc7d6b4a8be652d085316e112b34f
+
+Not in the port.
+
+
+2014-03-09 - pppd: Add declarations to eliminate compile warnings
+  50967962addebe15c7a7e63116ff46a0441dc464
+
+We are handling compilation warnings on our own
+
+
+2014-03-09 - pppd: Eliminate some unnecessary ifdefs
+  de8da14d845ee6db9236ccfddabf1d8ebf045ddb
+
+We mostly did that previously. Anyway, merged 2014-12-24.
diff --git a/src/netif/ppp/ipcp.c b/src/netif/ppp/ipcp.c
index b594d885..970e69e6 100644
--- a/src/netif/ppp/ipcp.c
+++ b/src/netif/ppp/ipcp.c
@@ -237,10 +237,10 @@ static option_t ipcp_option_list[] = {
     { "ipcp-no-address", o_bool, &ipcp_wantoptions[0].neg_addr,
       "Disable IP-Address usage", OPT_A2CLR,
       &ipcp_allowoptions[0].neg_addr },
-#ifdef __linux__
+
     { "noremoteip", o_bool, &noremoteip,
       "Allow peer to have no IP address", 1 },
-#endif
+
     { "nosendip", o_bool, &ipcp_wantoptions[0].neg_addr,
       "Don't send our IP address to peer", OPT_A2CLR,
       &ipcp_wantoptions[0].old_addrs},
diff --git a/src/netif/ppp/ipv6cp.c b/src/netif/ppp/ipv6cp.c
index 360cb518..5ff61835 100644
--- a/src/netif/ppp/ipv6cp.c
+++ b/src/netif/ppp/ipv6cp.c
@@ -144,8 +144,7 @@
  * Proxy Neighbour Discovery.
  *
  * Better defines for selecting the ordering of
- *   interface up / set address. (currently checks for __linux__,
- *   since SVR4 && (SNI || __USLC__) didn't work properly)
+ *   interface up / set address.
  */
 
 #include "lwip/opt.h"
@@ -232,10 +231,8 @@ static option_t ipv6cp_option_list[] = {
     { "ipv6cp-use-ipaddr", o_bool, &ipv6cp_allowoptions[0].use_ip,
       "Use (default) IPv4 address as interface identifier", 1 },
 
-#if defined(SOL2) || defined(__linux__)
     { "ipv6cp-use-persistent", o_bool, &ipv6cp_wantoptions[0].use_persistent,
       "Use uniquely-available persistent value for link local address", 1 },
-#endif /* defined(SOL2) */
 
     { "ipv6cp-restart", o_int, &ipv6cp_fsm[0].timeouttime,
       "Set timeout for IPv6CP", OPT_PRIO },
@@ -1047,7 +1044,6 @@ static void ipv6_check_options() {
     if (!ipv6cp_protent.enabled_flag)
 	return;
 
-#if defined(SOL2) || defined(__linux__)
     /*
      * Persistent link-local id is only used when user has not explicitly
      * configure/hard-code the id
@@ -1067,7 +1063,6 @@ static void ipv6_check_options() {
 	    wo->opt_local = 1;
 	}
     }
-#endif
 
     if (!wo->opt_local) {	/* init interface identifier */
 	if (wo->use_ip && eui64_iszero(wo->ourid)) {