aboutsummaryrefslogtreecommitdiffstats
path: root/package/ppp/patches/206-compensate_time_change.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-28 16:51:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-28 16:51:12 +0000
commit4c4da37c09bf04527ba4e76e701be8c718b8b97f (patch)
tree3c0a33f3ba9215da4babc521e221737ca14ccaaa /package/ppp/patches/206-compensate_time_change.patch
parente18ceb1dac82bf340a8d4c82bfd727a4ca4cec06 (diff)
downloadupstream-4c4da37c09bf04527ba4e76e701be8c718b8b97f.tar.gz
upstream-4c4da37c09bf04527ba4e76e701be8c718b8b97f.tar.bz2
upstream-4c4da37c09bf04527ba4e76e701be8c718b8b97f.zip
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> SVN-Revision: 27818
Diffstat (limited to 'package/ppp/patches/206-compensate_time_change.patch')
-rw-r--r--package/ppp/patches/206-compensate_time_change.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/ppp/patches/206-compensate_time_change.patch b/package/ppp/patches/206-compensate_time_change.patch
index f842ff2ee6..4ec488fa47 100644
--- a/package/ppp/patches/206-compensate_time_change.patch
+++ b/package/ppp/patches/206-compensate_time_change.patch
@@ -8,7 +8,7 @@
#include "pppd.h"
#include "magic.h"
-@@ -227,6 +228,7 @@ static struct subprocess *children;
+@@ -228,6 +229,7 @@ static struct subprocess *children;
/* Prototypes for procedures local to this file. */
@@ -16,7 +16,7 @@
static void setup_signals __P((void));
static void create_pidfile __P((int pid));
static void create_linkpidfile __P((int pid));
-@@ -532,6 +534,7 @@ main(argc, argv)
+@@ -533,6 +535,7 @@ main(argc, argv)
info("Starting link");
}
@@ -24,7 +24,7 @@
gettimeofday(&start_time, NULL);
script_unsetenv("CONNECT_TIME");
script_unsetenv("BYTES_SENT");
-@@ -1264,6 +1267,36 @@ struct callout {
+@@ -1265,6 +1268,36 @@ struct callout {
static struct callout *callout = NULL; /* Callout list */
static struct timeval timenow; /* Current time */
@@ -61,7 +61,7 @@
/*
* timeout - Schedule a timeout.
-@@ -1334,6 +1367,8 @@ calltimeout()
+@@ -1335,6 +1368,8 @@ calltimeout()
{
struct callout *p;
@@ -70,7 +70,7 @@
while (callout != NULL) {
p = callout;
-@@ -1361,6 +1396,8 @@ timeleft(tvp)
+@@ -1362,6 +1397,8 @@ timeleft(tvp)
{
if (callout == NULL)
return NULL;