diff options
author | Steven Barth <cyrus@openwrt.org> | 2014-06-15 20:55:17 +0000 |
---|---|---|
committer | Steven Barth <cyrus@openwrt.org> | 2014-06-15 20:55:17 +0000 |
commit | 941ab9a89ada8ce32d143668ae509c6741245a17 (patch) | |
tree | 61ec8e63dec95149e09e718c0e715f7bcc9d274b /package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch | |
parent | 1599e6f6015fd97f4272182b3f6e3d67f78a30bf (diff) | |
download | upstream-941ab9a89ada8ce32d143668ae509c6741245a17.tar.gz upstream-941ab9a89ada8ce32d143668ae509c6741245a17.tar.bz2 upstream-941ab9a89ada8ce32d143668ae509c6741245a17.zip |
ppp: bump to 2.4.6
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 41193
Diffstat (limited to 'package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch')
-rw-r--r-- | package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch index c5457fa515..b59c33e623 100644 --- a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch +++ b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch @@ -23,7 +23,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> new_phase(PHASE_INITIALIZE); --- a/pppd/options.c +++ b/pppd/options.c -@@ -115,6 +115,8 @@ int connect_delay = 1000; /* wait this m +@@ -116,6 +116,8 @@ int connect_delay = 1000; /* wait this m int req_unit = -1; /* requested interface unit */ char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */ @@ -32,7 +32,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> bool multilink = 0; /* Enable multilink operation */ char *bundle_name = NULL; /* bundle name for multilink */ bool dump_options; /* print out option values */ -@@ -290,6 +292,13 @@ option_t general_options[] = { +@@ -308,6 +310,13 @@ option_t general_options[] = { "Set pathname of ip-down script", OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, @@ -48,7 +48,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> "Enable multilink operation", OPT_PRIO | 1 }, --- a/pppd/ipv6cp.c +++ b/pppd/ipv6cp.c -@@ -1288,7 +1288,7 @@ ipv6cp_up(f) +@@ -1303,7 +1303,7 @@ ipv6cp_up(f) */ if (ipv6cp_script_state == s_down && ipv6cp_script_pid == 0) { ipv6cp_script_state = s_up; @@ -57,7 +57,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> } } -@@ -1339,7 +1339,7 @@ ipv6cp_down(f) +@@ -1357,7 +1357,7 @@ ipv6cp_down(f) /* Execute the ipv6-down script */ if (ipv6cp_script_state == s_up && ipv6cp_script_pid == 0) { ipv6cp_script_state = s_down; @@ -66,7 +66,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> } } -@@ -1382,13 +1382,13 @@ ipv6cp_script_done(arg) +@@ -1400,13 +1400,13 @@ ipv6cp_script_done(arg) case s_up: if (ipv6cp_fsm[0].state != OPENED) { ipv6cp_script_state = s_down; @@ -84,7 +84,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> } --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -315,6 +315,8 @@ extern int max_data_rate; /* max bytes/s +@@ -319,6 +319,8 @@ extern int max_data_rate; /* max bytes/s extern int req_unit; /* interface unit number to use */ extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ |