mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 22:36:46 +02:00
79c8117684
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
23 lines
590 B
Diff
23 lines
590 B
Diff
--- a/pppd/plugins/rp-pppoe/discovery.c
|
|
+++ b/pppd/plugins/rp-pppoe/discovery.c
|
|
@@ -548,7 +548,9 @@ discovery(PPPoEConnection *conn)
|
|
conn->discoveryState = STATE_SENT_PADI;
|
|
waitForPADO(conn, timeout);
|
|
|
|
+#if 0
|
|
timeout *= 2;
|
|
+#endif
|
|
} 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);
|
|
+#if 0
|
|
timeout *= 2;
|
|
+#endif
|
|
} while (conn->discoveryState == STATE_SENT_PADR);
|
|
|
|
/* We're done. */
|