From 552589f098887e2b8e0bda4fee68e8556903e092 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Sat, 9 Jun 2012 14:14:06 +0200
Subject: [PATCH] removed multilink option when multilink support is not
 compiled

---
 src/netif/ppp/lcp.c     | 18 ++++++++++++++----
 src/netif/ppp/options.c |  2 ++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/netif/ppp/lcp.c b/src/netif/ppp/lcp.c
index 495ea1f5..241b3999 100644
--- a/src/netif/ppp/lcp.c
+++ b/src/netif/ppp/lcp.c
@@ -741,11 +741,15 @@ lcp_resetci(f)
     wo->magicnumber = magic();
     wo->numloops = 0;
     *go = *wo;
+#ifdef HAVE_MULTILINK
     if (!multilink) {
+#endif /* HAVE_MULTILINK */
 	go->neg_mrru = 0;
 	go->neg_ssnhf = 0;
 	go->neg_endpoint = 0;
+#ifdef HAVE_MULTILINK
     }
+#endif /* HAVE_MULTILINK */
     if (noendpoint)
 	ao->neg_endpoint = 0;
     peer_mru[f->unit] = PPP_MRU;
@@ -2165,8 +2169,11 @@ lcp_reqci(f, inp, lenp, reject_if_disagree)
 	    break;
 
 	case CI_MRRU:
-	    if (!ao->neg_mrru || !multilink ||
-		cilen != CILEN_SHORT) {
+	    if (!ao->neg_mrru
+#ifdef HAVE_MULTILINK
+		|| !multilink
+#endif /* HAVE_MULTILINK */
+		|| cilen != CILEN_SHORT) {
 		orc = CONFREJ;
 		break;
 	    }
@@ -2178,8 +2185,11 @@ lcp_reqci(f, inp, lenp, reject_if_disagree)
 	    break;
 
 	case CI_SSNHF:
-	    if (!ao->neg_ssnhf || !multilink ||
-		cilen != CILEN_VOID) {
+	    if (!ao->neg_ssnhf
+#ifdef HAVE_MULTILINK
+		|| !multilink
+#endif /* HAVE_MULTILINK */
+		|| cilen != CILEN_VOID) {
 		orc = CONFREJ;
 		break;
 	    }
diff --git a/src/netif/ppp/options.c b/src/netif/ppp/options.c
index 5dd15894..17cd6442 100644
--- a/src/netif/ppp/options.c
+++ b/src/netif/ppp/options.c
@@ -121,7 +121,9 @@ char	linkname[MAXPATHLEN];	/* logical name for link */
 bool	tune_kernel;		/* may alter kernel settings */
 int	connect_delay = 1000;	/* wait this many ms after connect script */
 int	req_unit = -1;		/* requested interface unit */
+#if 0
 bool	multilink = 0;		/* Enable multilink operation */
+#endif
 char	*bundle_name = NULL;	/* bundle name for multilink */
 bool	dump_options;		/* print out option values */
 #if 0