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:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user