From 4c4da37c09bf04527ba4e76e701be8c718b8b97f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 28 Jul 2011 16:51:12 +0000 Subject: 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 SVN-Revision: 27818 --- package/ppp/patches/205-no_exponential_timeout.patch | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'package/ppp/patches/205-no_exponential_timeout.patch') diff --git a/package/ppp/patches/205-no_exponential_timeout.patch b/package/ppp/patches/205-no_exponential_timeout.patch index 76a200d..14d00cf 100644 --- a/package/ppp/patches/205-no_exponential_timeout.patch +++ b/package/ppp/patches/205-no_exponential_timeout.patch @@ -1,21 +1,16 @@ --- a/pppd/plugins/rp-pppoe/discovery.c +++ b/pppd/plugins/rp-pppoe/discovery.c -@@ -593,12 +593,14 @@ discovery(PPPoEConnection *conn) +@@ -548,7 +548,9 @@ discovery(PPPoEConnection *conn) conn->discoveryState = STATE_SENT_PADI; waitForPADO(conn, timeout); +#if 0 - /* If we're just probing for access concentrators, don't do - exponential backoff. This reduces the time for an unsuccessful - probe to 15 seconds. */ - if (!conn->printACNames) { - timeout *= 2; - } + timeout *= 2; +#endif - if (conn->printACNames && conn->numPADOs) { - break; - } -@@ -621,7 +623,9 @@ discovery(PPPoEConnection *conn) + } while (conn->discoveryState == STATE_SENT_PADI); + + timeout = conn->discoveryTimeout; +@@ -563,7 +565,9 @@ discovery(PPPoEConnection *conn) sendPADR(conn); conn->discoveryState = STATE_SENT_PADR; waitForPADS(conn, timeout); -- cgit v1.1