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 | abe70b1494c60a3f9cbe5e4d8d967a82dd1e29a5 (patch) | |
| tree | 46b83031a0da1b4458317413c00d13c252c72afa /package/ppp/patches/405-no_multilink_option.patch | |
| parent | 41d09b7d7880b83b0e544574296b2b3673792c7f (diff) | |
| download | master-187ad058-abe70b1494c60a3f9cbe5e4d8d967a82dd1e29a5.tar.gz master-187ad058-abe70b1494c60a3f9cbe5e4d8d967a82dd1e29a5.tar.bz2 master-187ad058-abe70b1494c60a3f9cbe5e4d8d967a82dd1e29a5.zip | |
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.patch | 28 |
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 97a79c474a..0000000000 --- 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 }, |