diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-28 16:51:12 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-28 16:51:12 +0000 |
| commit | 79c8117684bd3378e9a269c8c73a34fe7e399dcc (patch) | |
| tree | f300b7d987f7c0fda4a0d7f8213ec62ac86a7b5a /package/ppp/patches/100-debian_ip-ip_option.patch | |
| parent | e5839cb1022761ce449329e64e66fe70067f6962 (diff) | |
ppp: version bump to 2.4.5
Bump to the current version of PPP.
A few of the patches are either in 2.4.5 or something functionally equivalent is, so those patches were removed.
1 patch was added to accommodate pppol2pv3_addr which is referenced in a linux kernel header file, but isn't defined in the kernel header files packaged with PPP.
Redux: re-instate the commenting out of the exponential back-off as requested by Felix.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27818 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ppp/patches/100-debian_ip-ip_option.patch')
| -rw-r--r-- | package/ppp/patches/100-debian_ip-ip_option.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/ppp/patches/100-debian_ip-ip_option.patch b/package/ppp/patches/100-debian_ip-ip_option.patch index d7b1943822..4ba12fc274 100644 --- a/package/ppp/patches/100-debian_ip-ip_option.patch +++ b/package/ppp/patches/100-debian_ip-ip_option.patch @@ -1,6 +1,6 @@ --- a/pppd/ipcp.c +++ b/pppd/ipcp.c -@@ -1850,7 +1850,7 @@ ipcp_up(f) +@@ -1939,7 +1939,7 @@ ipcp_up(f) */ if (ipcp_script_state == s_down && ipcp_script_pid == 0) { ipcp_script_state = s_up; @@ -9,7 +9,7 @@ } } -@@ -1900,7 +1900,7 @@ ipcp_down(f) +@@ -1989,7 +1989,7 @@ ipcp_down(f) /* Execute the ip-down script */ if (ipcp_script_state == s_up && ipcp_script_pid == 0) { ipcp_script_state = s_down; @@ -18,7 +18,7 @@ } } -@@ -1954,13 +1954,13 @@ ipcp_script_done(arg) +@@ -2043,13 +2043,13 @@ ipcp_script_done(arg) case s_up: if (ipcp_fsm[0].state != OPENED) { ipcp_script_state = s_down; @@ -36,7 +36,7 @@ } --- a/pppd/main.c +++ b/pppd/main.c -@@ -315,6 +315,9 @@ main(argc, argv) +@@ -316,6 +316,9 @@ main(argc, argv) struct protent *protp; char numbuf[16]; @@ -73,7 +73,7 @@ "Enable multilink operation", OPT_PRIO | 1 }, --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -312,6 +312,8 @@ extern bool tune_kernel; /* May alter ke +@@ -313,6 +313,8 @@ extern bool tune_kernel; /* May alter ke extern int connect_delay; /* Time to delay after connect script */ extern int max_data_rate; /* max bytes/sec through charshunt */ extern int req_unit; /* interface unit number to use */ |