X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/184fbf8c196e5c9159b280833c513c6ef582ae3f..8b4aee843bbd9d4e87e2c63b9c6d9d34c142a272:/package/ppp/patches/205-no_exponential_timeout.patch?ds=inline

diff --git a/package/ppp/patches/205-no_exponential_timeout.patch b/package/ppp/patches/205-no_exponential_timeout.patch
index 3a3488b0c..14d00cf92 100644
--- a/package/ppp/patches/205-no_exponential_timeout.patch
+++ b/package/ppp/patches/205-no_exponential_timeout.patch
@@ -1,50 +1,16 @@
-diff -Naur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.4/pppd/plugins/rp-pppoe/discovery.c
---- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/discovery.c	2009-05-07 19:47:30.000000000 -0400
-+++ ppp-2.4.4/pppd/plugins/rp-pppoe/discovery.c	2009-05-07 20:23:04.000000000 -0400
-@@ -593,12 +593,14 @@
+--- 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
- 	/* 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;
- 	}
-+#endif
- 	if (conn->printACNames && conn->numPADOs) {
- 	    break;
- 	}
-@@ -621,7 +623,9 @@
- 	sendPADR(conn);
- 	conn->discoveryState = STATE_SENT_PADR;
- 	waitForPADS(conn, timeout);
 +#if 0
  	timeout *= 2;
 +#endif
-     } while (conn->discoveryState == STATE_SENT_PADR);
+     } while (conn->discoveryState == STATE_SENT_PADI);
  
-     /* We're done. */
-diff -Naur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.4/pppd/plugins/rp-pppoe/discovery.c
---- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/discovery.c	2009-05-07 19:47:30.000000000 -0400
-+++ ppp-2.4.4/pppd/plugins/rp-pppoe/discovery.c	2009-05-07 20:23:04.000000000 -0400
-@@ -593,12 +593,14 @@
- 	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;
- 	}
-+#endif
- 	if (conn->printACNames && conn->numPADOs) {
- 	    break;
- 	}
-@@ -621,7 +623,9 @@
+     timeout = conn->discoveryTimeout;
+@@ -563,7 +565,9 @@ discovery(PPPoEConnection *conn)
  	sendPADR(conn);
  	conn->discoveryState = STATE_SENT_PADR;
  	waitForPADS(conn, timeout);