ppp: Try longer to connect via PPPoE (60 seconds).
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 14 May 2014 18:02:55 +0000 (20:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 14 May 2014 18:02:55 +0000 (20:02 +0200)
lfs/ppp
src/patches/ppp-2.4.6-increase-max-padi-attempts.patch [new file with mode: 0644]

diff --git a/lfs/ppp b/lfs/ppp
index ba72f4c..2e47fef 100644 (file)
--- 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
        @$(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)"
        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 (file)
index 0000000..b09a9b5
--- /dev/null
@@ -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