webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-24 01:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2014-05-21 22:47:13 +02:00
parent 30b1c1c728 3e8286210f
commit d2dcd8b2e2
13 changed files with 761 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/kernel/kernel.config.armv5tel-ipfire-kirkwood
View File

@@ -953,6 +953,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m

1
config/kernel/kernel.config.armv5tel-ipfire-multi
View File

@@ -1142,6 +1142,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m

1
config/kernel/kernel.config.armv5tel-ipfire-rpi
View File

@@ -888,6 +888,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m

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

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 3.10.33 Kernel Configuration
# Linux/x86 3.10.40-ipfire Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -582,29 +582,29 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
# x86 CPU frequency scaling drivers
#
CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=y
CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m
# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
# CONFIG_X86_POWERNOW_K6 is not set
CONFIG_X86_POWERNOW_K7=y
CONFIG_X86_POWERNOW_K6=m
CONFIG_X86_POWERNOW_K7=m
CONFIG_X86_POWERNOW_K7_ACPI=y
CONFIG_X86_POWERNOW_K8=y
# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set
# CONFIG_X86_GX_SUSPMOD is not set
CONFIG_X86_POWERNOW_K8=m
CONFIG_X86_AMD_FREQ_SENSITIVITY=m
CONFIG_X86_GX_SUSPMOD=m
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_SPEEDSTEP_ICH=y
CONFIG_X86_SPEEDSTEP_SMI=y
CONFIG_X86_P4_CLOCKMOD=y
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
CONFIG_X86_LONGRUN=y
# CONFIG_X86_LONGHAUL is not set
CONFIG_X86_SPEEDSTEP_ICH=m
CONFIG_X86_SPEEDSTEP_SMI=m
CONFIG_X86_P4_CLOCKMOD=m
CONFIG_X86_CPUFREQ_NFORCE2=m
CONFIG_X86_LONGRUN=m
CONFIG_X86_LONGHAUL=m
# CONFIG_X86_E_POWERSAVER is not set
#
# shared options
#
CONFIG_X86_SPEEDSTEP_LIB=y
# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -913,6 +913,8 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m
CONFIG_NETFILTER_XT_MATCH_HL=m
CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
# CONFIG_NETFILTER_XT_MATCH_IPVS is not set
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -931,8 +933,6 @@ CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -1140,6 +1140,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m

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

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 3.10.33 Kernel Configuration
# Linux/x86 3.10.39-ipfire Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -55,9 +55,9 @@ CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
# CONFIG_KERNEL_GZIP is not set
# CONFIG_KERNEL_BZIP2 is not set
CONFIG_KERNEL_BZIP2=y
# CONFIG_KERNEL_LZMA is not set
CONFIG_KERNEL_XZ=y
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
@@ -594,29 +594,29 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
# x86 CPU frequency scaling drivers
#
CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=y
CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m
# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
# CONFIG_X86_POWERNOW_K6 is not set
CONFIG_X86_POWERNOW_K7=y
CONFIG_X86_POWERNOW_K6=m
CONFIG_X86_POWERNOW_K7=m
CONFIG_X86_POWERNOW_K7_ACPI=y
CONFIG_X86_POWERNOW_K8=y
# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set
# CONFIG_X86_GX_SUSPMOD is not set
CONFIG_X86_POWERNOW_K8=m
CONFIG_X86_AMD_FREQ_SENSITIVITY=m
CONFIG_X86_GX_SUSPMOD=m
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_SPEEDSTEP_ICH=y
CONFIG_X86_SPEEDSTEP_SMI=y
CONFIG_X86_P4_CLOCKMOD=y
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
CONFIG_X86_LONGRUN=y
# CONFIG_X86_LONGHAUL is not set
CONFIG_X86_SPEEDSTEP_ICH=m
CONFIG_X86_SPEEDSTEP_SMI=m
CONFIG_X86_P4_CLOCKMOD=m
CONFIG_X86_CPUFREQ_NFORCE2=m
CONFIG_X86_LONGRUN=m
CONFIG_X86_LONGHAUL=m
# CONFIG_X86_E_POWERSAVER is not set
#
# shared options
#
CONFIG_X86_SPEEDSTEP_LIB=y
# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -925,6 +925,8 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m
CONFIG_NETFILTER_XT_MATCH_HL=m
CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
# CONFIG_NETFILTER_XT_MATCH_IPVS is not set
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -943,8 +945,6 @@ CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -1152,6 +1152,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m

1
config/rootfiles/common/armv5tel/linux-kirkwood
View File

@@ -2243,6 +2243,7 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_mqprio.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_pie.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_plug.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_qfq.ko

1
config/rootfiles/common/armv5tel/linux-multi
View File

@@ -2195,6 +2195,7 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_mqprio.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_pie.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_plug.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_qfq.ko

1
config/rootfiles/common/armv5tel/linux-rpi
View File

@@ -1804,6 +1804,7 @@ lib/modules/KVER-ipfire-rpi
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_mqprio.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_pie.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_plug.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_qfq.ko

16
config/rootfiles/common/i586/linux
View File

@@ -240,10 +240,25 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/clocksource/cs5535-clockevt.ko
#lib/modules/KVER-ipfire/kernel/drivers/clocksource/scx200_hrt.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/acpi-cpufreq.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/amd_freq_sensitivity.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq-nforce2.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_conservative.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_ondemand.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_powersave.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_stats.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/gx-suspmod.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/longhaul.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/longrun.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/mperf.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/p4-clockmod.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/pcc-cpufreq.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k6.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k7.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k8.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-ich.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-lib.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-smi.ko
#lib/modules/KVER-ipfire/kernel/drivers/crypto
#lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko
#lib/modules/KVER-ipfire/kernel/drivers/crypto/hifn_795x.ko
@@ -2663,6 +2678,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/net/sched/sch_mqprio.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_pie.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_plug.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_qfq.ko

16
config/rootfiles/packages/linux-pae
View File

@@ -238,10 +238,25 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource
#lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource/cs5535-clockevt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/acpi-cpufreq.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/amd_freq_sensitivity.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq-nforce2.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_conservative.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_ondemand.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_powersave.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_stats.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/gx-suspmod.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/longhaul.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/longrun.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/mperf.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/p4-clockmod.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/pcc-cpufreq.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/powernow-k6.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/powernow-k7.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/powernow-k8.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/speedstep-ich.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/speedstep-lib.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/speedstep-smi.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto
#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-aes.ko
@@ -2675,6 +2690,7 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_mqprio.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_pie.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_plug.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_qfq.ko