kernel: fq_codel: dont reinit flow state

[openwrt/staging/chunkeey.git] / package / ppp / patches / 405-no_multilink_option.patch

diff --git a/package/ppp/patches/405-no_multilink_option.patch b/package/ppp/patches/405-no_multilink_option.patch
index 5c8cfbd061810025614c1e78e4b427b0e3b98ec2..97a79c474a20e41352f980e14258fd66abd3b7b3 100644 (file)
--- a/package/ppp/patches/405-no_multilink_option.patch
+++ b/package/ppp/patches/405-no_multilink_option.patch
@@ -1,6 +1,15 @@
+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
-@@ -309,13 +309,14 @@ option_t general_options[] = {
+@@ -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 },