Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

This commit is contained in:
Dirk Wagner
2014-07-01 11:11:09 +02:00
41 changed files with 386 additions and 216 deletions

View File

@@ -7,7 +7,7 @@ index 9ab2eee..86762bd 100644
/* How many PADI/PADS attempts? */
-#define MAX_PADI_ATTEMPTS 3
+#define MAX_PADI_ATTEMPTS 12
+#define MAX_PADI_ATTEMPTS 4
/* Initial timeout for PADO/PADS */
#define PADI_TIMEOUT 5