diff options
| author | Steven Barth <steven@midlink.org> | 2014-06-15 20:55:17 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-06-15 20:55:17 +0000 |
| commit | 02fcbc164361f4944371cf9101403cdd9e647433 (patch) | |
| tree | 72336ea5df4dc69920ea7cbd71c12805d33d281b /package/network/services/ppp/patches/205-no_exponential_timeout.patch | |
| parent | a20868ab2335d730e1771affad6a8046c1ffe2a8 (diff) | |
| download | master-187ad058-02fcbc164361f4944371cf9101403cdd9e647433.tar.gz master-187ad058-02fcbc164361f4944371cf9101403cdd9e647433.tar.bz2 master-187ad058-02fcbc164361f4944371cf9101403cdd9e647433.zip | |
ppp: bump to 2.4.6
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41193 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/ppp/patches/205-no_exponential_timeout.patch')
| -rw-r--r-- | package/network/services/ppp/patches/205-no_exponential_timeout.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/ppp/patches/205-no_exponential_timeout.patch b/package/network/services/ppp/patches/205-no_exponential_timeout.patch index 7119fb83f2..68aea12ef4 100644 --- a/package/network/services/ppp/patches/205-no_exponential_timeout.patch +++ b/package/network/services/ppp/patches/205-no_exponential_timeout.patch @@ -7,7 +7,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> --- a/pppd/plugins/rp-pppoe/discovery.c +++ b/pppd/plugins/rp-pppoe/discovery.c -@@ -548,7 +548,9 @@ discovery(PPPoEConnection *conn) +@@ -644,7 +644,9 @@ discovery(PPPoEConnection *conn) conn->discoveryState = STATE_SENT_PADI; waitForPADO(conn, timeout); @@ -17,7 +17,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> } while (conn->discoveryState == STATE_SENT_PADI); timeout = conn->discoveryTimeout; -@@ -563,7 +565,9 @@ discovery(PPPoEConnection *conn) +@@ -659,7 +661,9 @@ discovery(PPPoEConnection *conn) sendPADR(conn); conn->discoveryState = STATE_SENT_PADR; waitForPADS(conn, timeout); @@ -26,4 +26,4 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> +#endif } while (conn->discoveryState == STATE_SENT_PADR); - /* We're done. */ + if (!conn->seenMaxPayload) { |