summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-12 18:29:28 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-12 18:29:28 +0000
commit562ffbf7a2cb37b7036186bb3ef1127d694bf664 (patch)
treeafba69a7eed31a7340adc6ef3b0cd7d82a3fd489
parent9587f988b7e9f5b15eb3e561eeef81fedafde8eb (diff)
pppd: support the nomp option if multilink support is disabled
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26614 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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 000000000..5c8cfbd06
--- /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 },