webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2014-06-24 08:05:39 +02:00
parent 01183cccc3 ef7686badb
commit a788e50410
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/kernel/kernel.config.i586-ipfire
View File

@@ -581,7 +581,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
# #
# x86 CPU frequency scaling drivers # x86 CPU frequency scaling drivers
# #
CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_PSTATE is not set
CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m
# CONFIG_X86_ACPI_CPUFREQ_CPB is not set # CONFIG_X86_ACPI_CPUFREQ_CPB is not set

2
config/kernel/kernel.config.i586-ipfire-pae
View File

@@ -593,7 +593,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
# #
# x86 CPU frequency scaling drivers # x86 CPU frequency scaling drivers
# #
CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_PSTATE is not set
CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m
# CONFIG_X86_ACPI_CPUFREQ_CPB is not set # CONFIG_X86_ACPI_CPUFREQ_CPB is not set

2
lfs/linux
View File

@@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS = CFLAGS =
CXXFLAGS = CXXFLAGS =
PAK_VER = 50 PAK_VER = 51
DEPS = "" DEPS = ""
VERSUFIX=ipfire$(KCFG) VERSUFIX=ipfire$(KCFG)

6
lfs/samba
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 3.6.23 VER = 3.6.24
THISAPP = samba-$(VER) THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba PROG = samba
PAK_VER = 57 PAK_VER = 58
DEPS = "cups" DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2f7aee1dc5d31aefcb364600915b31dc $(DL_FILE)_MD5 = d98425c0c2b73e08f048d31ffc727fb0
install : $(TARGET) install : $(TARGET)

2
src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch
View File

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