summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-12 18:29:28 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-12 18:29:28 +0000
commit512bb389ee6125135c6da818686f98774191b457 (patch)
tree1ffc6272947c9030971328d60fd741fdfe592b07
parent768877966df40082d0b8b38bfd7022d713d4e518 (diff)
downloadmaster-31e0f0ae-512bb389ee6125135c6da818686f98774191b457.tar.gz
master-31e0f0ae-512bb389ee6125135c6da818686f98774191b457.tar.bz2
master-31e0f0ae-512bb389ee6125135c6da818686f98774191b457.zip
pppd: support the nomp option if multilink support is disabled
SVN-Revision: 26614
-rw-r--r--package/ppp/patches/405-no_multilink_option.patch19
1 files changed, 19 insertions, 0 deletions
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 },