diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-05-21 10:48:24 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-05-21 10:48:24 +0000 |
| commit | b97b54291da149cf68a6db878aae2f92962e1cad (patch) | |
| tree | f38b2d8c653a7677346f4b25e4f80e636a73ea42 /package/ppp/patches/205-no_exponential_timeout.patch | |
| parent | 9137c11605e9bd0f7cc67895fd852e0b04cb672d (diff) | |
| download | upstream-b97b54291da149cf68a6db878aae2f92962e1cad.tar.gz upstream-b97b54291da149cf68a6db878aae2f92962e1cad.tar.bz2 upstream-b97b54291da149cf68a6db878aae2f92962e1cad.zip | |
Make patches apply agagin. The deleted parts were two times in the patches.
SVN-Revision: 15957
Diffstat (limited to 'package/ppp/patches/205-no_exponential_timeout.patch')
| -rw-r--r-- | package/ppp/patches/205-no_exponential_timeout.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/package/ppp/patches/205-no_exponential_timeout.patch b/package/ppp/patches/205-no_exponential_timeout.patch index 3a3488b0ca..ca53d3474d 100644 --- a/package/ppp/patches/205-no_exponential_timeout.patch +++ b/package/ppp/patches/205-no_exponential_timeout.patch @@ -26,31 +26,3 @@ diff -Naur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.4/pppd/plugi } while (conn->discoveryState == STATE_SENT_PADR); /* 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 @@ - sendPADR(conn); - conn->discoveryState = STATE_SENT_PADR; - waitForPADS(conn, timeout); -+#if 0 - timeout *= 2; -+#endif - } while (conn->discoveryState == STATE_SENT_PADR); - - /* We're done. */ |