mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
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
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user