diff options
| author | Shiji Yang | 2024-10-04 14:40:11 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2024-10-12 13:53:06 +0000 |
| commit | 7eb6bf1ac9798f07577f7c2e0ef12f622efc6315 (patch) | |
| tree | 3e450cbc35e2df8b85d1c2b665bd086f2826f1bc | |
| parent | 8766a92766962f7267bf44851aaacd3588249473 (diff) | |
| download | openwrt-7eb6bf1ac9798f07577f7c2e0ef12f622efc6315.tar.gz | |
ppp: remove discovery phase timeout hack patch
In the original code, the entire time delay of the discovery phase
is only 5+5x2+5x2x2 = 35s. Increasing timeout may be necessary if
discovery phase fails on first attempt. There is a chance to fix
the "Timeout waiting for PADO packets" issue by removing this patch.
Signed-off-by: Shiji Yang <yangshiji66@qq.com>
Link: https://github.com/openwrt/openwrt/pull/16605
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | package/network/services/ppp/patches/205-no_exponential_timeout.patch | 29 |
1 files changed, 0 insertions, 29 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 deleted file mode 100644 index c238c746ab..0000000000 --- a/package/network/services/ppp/patches/205-no_exponential_timeout.patch +++ /dev/null @@ -1,29 +0,0 @@ -pppd: Don't use exponential timeout in discovery phase - -This patch removes the exponential timeout increase between PADO or PADS -discovery attempts. - -Signed-off-by: Jo-Philipp Wich <jo@mein.io> - ---- a/pppd/plugins/pppoe/discovery.c -+++ b/pppd/plugins/pppoe/discovery.c -@@ -689,7 +689,9 @@ discovery1(PPPoEConnection *conn, int wa - conn->discoveryState = STATE_SENT_PADI; - waitForPADO(conn, timeout, waitWholeTimeoutForPADO); - -+#if 0 - timeout *= 2; -+#endif - } while (conn->discoveryState == STATE_SENT_PADI); - } - -@@ -719,7 +721,9 @@ discovery2(PPPoEConnection *conn) - sendPADR(conn); - conn->discoveryState = STATE_SENT_PADR; - waitForPADS(conn, timeout); -+#if 0 - timeout *= 2; -+#endif - } while (conn->discoveryState == STATE_SENT_PADR); - - if (!conn->seenMaxPayload) { |