From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 12 Apr 2011 18:29:28 +0000 (+0000)
Subject: pppd: support the nomp option if multilink support is disabled
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=17ee3e0bb115dad618622e669d6aed4462e170af;ds=sidebyside

pppd: support the nomp option if multilink support is disabled

SVN-Revision: 26614
---

diff --git a/package/ppp/patches/405-no_multilink_option.patch b/package/ppp/patches/405-no_multilink_option.patch
new file mode 100644
index 0000000000..5c8cfbd061
--- /dev/null
+++ b/package/ppp/patches/405-no_multilink_option.patch
@@ -0,0 +1,19 @@
+--- a/pppd/options.c
++++ b/pppd/options.c
+@@ -309,13 +309,14 @@ option_t general_options[] = {
+       "Enable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 1 },
+     { "nomultilink", o_bool, &multilink,
+       "Disable multilink operation", OPT_PRIOSUB | 0 },
+-    { "nomp", o_bool, &multilink,
+-      "Disable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 0 },
+ 
+     { "bundle", o_string, &bundle_name,
+       "Bundle name for multilink", OPT_PRIO },
+ #endif /* HAVE_MULTILINK */
+ 
++    { "nomp", o_bool, &multilink,
++      "Disable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 0 },
++
+ #ifdef PLUGIN
+     { "plugin", o_special, (void *)loadplugin,
+       "Load a plug-in module into pppd", OPT_PRIV | OPT_A2LIST },