From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 14 May 2014 18:02:55 +0000 (+0200)
Subject: ppp: Try longer to connect via PPPoE (60 seconds).
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=0a511b76938a036a46446ca5cf35a47482c39382;hp=aab13a8d9d873c2ad83bb2454ca03d90bfecfd53

ppp: Try longer to connect via PPPoE (60 seconds).
---

diff --git a/lfs/ppp b/lfs/ppp
index ba72f4c83..2e47fef4c 100644
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && rm -f include/pcap-int.h include/linux/if_pppol2tp.h
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp-2.4.6-increase-max-padi-attempts.patch
 	cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING) CC="gcc $(CFLAGS)"
diff --git a/src/patches/ppp-2.4.6-increase-max-padi-attempts.patch b/src/patches/ppp-2.4.6-increase-max-padi-attempts.patch
new file mode 100644
index 000000000..b09a9b52d
--- /dev/null
+++ b/src/patches/ppp-2.4.6-increase-max-padi-attempts.patch
@@ -0,0 +1,13 @@
+diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
+index 9ab2eee..86762bd 100644
+--- a/pppd/plugins/rp-pppoe/pppoe.h
++++ b/pppd/plugins/rp-pppoe/pppoe.h
+@@ -148,7 +148,7 @@ extern UINT16_t Eth_PPPOE_Session;
+ #define STATE_TERMINATED    4
+ 
+ /* How many PADI/PADS attempts? */
+-#define MAX_PADI_ATTEMPTS 3
++#define MAX_PADI_ATTEMPTS 12
+ 
+ /* Initial timeout for PADO/PADS */
+ #define PADI_TIMEOUT 5