mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-07-07 22:18:35 +03:00
5cae7371a7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32463 3c298f89-4303-0410-b956-a3cf2f4a3e73
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
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 },
|