2012-06-20 01:03:24 +08:00
|
|
|
pppd: Don't use exponential timeout in discovery phase
|
|
|
|
|
|
|
|
|
|
This patch removes the exponential timeout increase between PADO or PADS
|
|
|
|
|
discovery attempts.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
|
|
|
|
|
|
2009-05-21 18:49:21 +08:00
|
|
|
--- a/pppd/plugins/rp-pppoe/discovery.c
|
|
|
|
|
+++ b/pppd/plugins/rp-pppoe/discovery.c
|
2011-07-29 00:51:12 +08:00
|
|
|
@@ -548,7 +548,9 @@ discovery(PPPoEConnection *conn)
|
2009-05-21 06:36:38 +08:00
|
|
|
conn->discoveryState = STATE_SENT_PADI;
|
|
|
|
|
waitForPADO(conn, timeout);
|
|
|
|
|
|
|
|
|
|
+#if 0
|
2011-07-29 00:51:12 +08:00
|
|
|
timeout *= 2;
|
2009-05-21 06:36:38 +08:00
|
|
|
+#endif
|
2011-07-29 00:51:12 +08:00
|
|
|
} while (conn->discoveryState == STATE_SENT_PADI);
|
|
|
|
|
|
|
|
|
|
timeout = conn->discoveryTimeout;
|
|
|
|
|
@@ -563,7 +565,9 @@ discovery(PPPoEConnection *conn)
|
2009-05-21 06:36:38 +08:00
|
|
|
sendPADR(conn);
|
|
|
|
|
conn->discoveryState = STATE_SENT_PADR;
|
|
|
|
|
waitForPADS(conn, timeout);
|
|
|
|
|
+#if 0
|
|
|
|
|
timeout *= 2;
|
|
|
|
|
+#endif
|
|
|
|
|
} while (conn->discoveryState == STATE_SENT_PADR);
|
|
|
|
|
|
|
|
|
|
/* We're done. */
|
