diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-10-10 12:32:29 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-10 12:32:29 +0000 |
| commit | 405e21d16731b2764ab82aaaadcf36a813b105f7 (patch) | |
| tree | c6f9a8402389a5081519b91ce62c4a8cafcb8917 /package/network/services/ppp/patches/405-no_multilink_option.patch | |
| parent | d0ec348ded6f715b43b396b06ccb10599b37969d (diff) | |
| download | openwrt-405e21d16731b2764ab82aaaadcf36a813b105f7.tar.gz openwrt-405e21d16731b2764ab82aaaadcf36a813b105f7.tar.bz2 openwrt-405e21d16731b2764ab82aaaadcf36a813b105f7.zip | |
packages: sort network related packages into package/network/
SVN-Revision: 33688
Diffstat (limited to 'package/network/services/ppp/patches/405-no_multilink_option.patch')
| -rw-r--r-- | package/network/services/ppp/patches/405-no_multilink_option.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/network/services/ppp/patches/405-no_multilink_option.patch b/package/network/services/ppp/patches/405-no_multilink_option.patch new file mode 100644 index 0000000000..97a79c474a --- /dev/null +++ b/package/network/services/ppp/patches/405-no_multilink_option.patch @@ -0,0 +1,28 @@ +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 }, |