diff options
| author | Steven Barth <cyrus@openwrt.org> | 2014-06-15 20:55:17 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2014-06-15 20:55:17 +0000 |
| commit | 941ab9a89ada8ce32d143668ae509c6741245a17 (patch) | |
| tree | 61ec8e63dec95149e09e718c0e715f7bcc9d274b /package/network/services/ppp/patches/205-no_exponential_timeout.patch | |
| parent | 1599e6f6015fd97f4272182b3f6e3d67f78a30bf (diff) | |
| download | upstream-941ab9a89ada8ce32d143668ae509c6741245a17.tar.gz upstream-941ab9a89ada8ce32d143668ae509c6741245a17.tar.bz2 upstream-941ab9a89ada8ce32d143668ae509c6741245a17.zip | |
ppp: bump to 2.4.6
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 41193
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) { |