summaryrefslogtreecommitdiffstats
path: root/package/ppp/patches/405-no_multilink_option.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-10 12:32:29 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-10 12:32:29 +0000
commit9c8997d54dc9df184bfcedeabf0b3c85cf5e6753 (patch)
tree46b83031a0da1b4458317413c00d13c252c72afa /package/ppp/patches/405-no_multilink_option.patch
parenteecf5b17520f6b3b6ffb45ac7dca298d93b27501 (diff)
packages: sort network related packages into package/network/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33688 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ppp/patches/405-no_multilink_option.patch')
-rw-r--r--package/ppp/patches/405-no_multilink_option.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/package/ppp/patches/405-no_multilink_option.patch b/package/ppp/patches/405-no_multilink_option.patch
deleted file mode 100644
index 97a79c474..000000000
--- a/package/ppp/patches/405-no_multilink_option.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-pppd: Support "nomp" option even if multilink support is off
-
-This patch moves the "nomp" option entry outside of the defines protecting
-the multilink specific code. The motivation is to allow "nomp" even if pppd
-does not support multilink, so that controlling programs can unconditionally
-pass it to pppd regardless of the compile time features.
-
-Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
-
---- a/pppd/options.c
-+++ b/pppd/options.c
-@@ -318,13 +318,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 },