ath9k: fix a few crash issues on hardware reset

[openwrt.git] / package / ppp / patches / 205-no_exponential_timeout.patch

diff --git a/package/ppp/patches/205-no_exponential_timeout.patch b/package/ppp/patches/205-no_exponential_timeout.patch
index 76a200d..14d00cf 100644 (file)
--- a/package/ppp/patches/205-no_exponential_timeout.patch
+++ b/package/ppp/patches/205-no_exponential_timeout.patch
@@ -1,21 +1,16 @@
 --- a/pppd/plugins/rp-pppoe/discovery.c
 +++ b/pppd/plugins/rp-pppoe/discovery.c
 --- a/pppd/plugins/rp-pppoe/discovery.c
 +++ b/pppd/plugins/rp-pppoe/discovery.c

-@@ -593,12 +593,14 @@ discovery(PPPoEConnection *conn)
+@@ -548,7 +548,9 @@ discovery(PPPoEConnection *conn)

        conn->discoveryState = STATE_SENT_PADI;
        waitForPADO(conn, timeout);
  
 +#if 0
        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;
-       }
+       timeout *= 2;

 +#endif
 +#endif

-       if (conn->printACNames && conn->numPADOs) {
-           break;
-       }
-@@ -621,7 +623,9 @@ discovery(PPPoEConnection *conn)
+     } while (conn->discoveryState == STATE_SENT_PADI);
+ 
+     timeout = conn->discoveryTimeout;
+@@ -563,7 +565,9 @@ discovery(PPPoEConnection *conn)

        sendPADR(conn);
        conn->discoveryState = STATE_SENT_PADR;
        waitForPADS(conn, timeout);
        sendPADR(conn);
        conn->discoveryState = STATE_SENT_PADR;
        waitForPADS(conn, timeout);