diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-20 22:36:38 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-20 22:36:38 +0000 |
| commit | 9137c11605e9bd0f7cc67895fd852e0b04cb672d (patch) | |
| tree | 1796065955c8d3cb89a35b12741566a7198d93fd /package/ppp/patches/205-no_exponential_timeout.patch | |
| parent | 89127a67f2707136d0219cba44138aa65889ebef (diff) | |
| download | upstream-9137c11605e9bd0f7cc67895fd852e0b04cb672d.tar.gz upstream-9137c11605e9bd0f7cc67895fd852e0b04cb672d.tar.bz2 upstream-9137c11605e9bd0f7cc67895fd852e0b04cb672d.zip | |
update ppp to v2.4.4 (#5102)
SVN-Revision: 15955
Diffstat (limited to 'package/ppp/patches/205-no_exponential_timeout.patch')
| -rw-r--r-- | package/ppp/patches/205-no_exponential_timeout.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/package/ppp/patches/205-no_exponential_timeout.patch b/package/ppp/patches/205-no_exponential_timeout.patch new file mode 100644 index 0000000000..3a3488b0ca --- /dev/null +++ b/package/ppp/patches/205-no_exponential_timeout.patch @@ -0,0 +1,56 @@ +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. */ +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. */ |