[ppp] Make patches apply agagin.
[openwrt-10.03/.git] / package / ppp / patches / 205-no_exponential_timeout.patch
1 diff -Naur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.4/pppd/plugins/rp-pppoe/discovery.c
2 --- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/discovery.c    2009-05-07 19:47:30.000000000 -0400
3 +++ ppp-2.4.4/pppd/plugins/rp-pppoe/discovery.c 2009-05-07 20:23:04.000000000 -0400
4 @@ -593,12 +593,14 @@
5         conn->discoveryState = STATE_SENT_PADI;
6         waitForPADO(conn, timeout);
7  
8 +#if 0
9         /* If we're just probing for access concentrators, don't do
10            exponential backoff.  This reduces the time for an unsuccessful
11            probe to 15 seconds. */
12         if (!conn->printACNames) {
13             timeout *= 2;
14         }
15 +#endif
16         if (conn->printACNames && conn->numPADOs) {
17             break;
18         }
19 @@ -621,7 +623,9 @@
20         sendPADR(conn);
21         conn->discoveryState = STATE_SENT_PADR;
22         waitForPADS(conn, timeout);
23 +#if 0
24         timeout *= 2;
25 +#endif
26      } while (conn->discoveryState == STATE_SENT_PADR);
27  
28      /* We're done. */