projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2fce90c
)
kernel: clean up scheduler default config and kmod-sched kconfig symbols, enable...
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 12 Jul 2009 00:01:12 +0000
(
00:01
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 12 Jul 2009 00:01:12 +0000
(
00:01
+0000)
SVN-Revision: 16789
package/kernel/modules/netsupport.mk
patch
|
blob
|
history
target/linux/generic-2.6/config-2.6.28
patch
|
blob
|
history
target/linux/generic-2.6/config-2.6.29
patch
|
blob
|
history
target/linux/generic-2.6/config-2.6.30
patch
|
blob
|
history
target/linux/generic-2.6/config-2.6.31
patch
|
blob
|
history
diff --git
a/package/kernel/modules/netsupport.mk
b/package/kernel/modules/netsupport.mk
index e848037f81d3145b71959eb1863fa1a815cc9677..04cdb061fc914890da8a27396c3ae769a13aa12f 100644
(file)
--- a/
package/kernel/modules/netsupport.mk
+++ b/
package/kernel/modules/netsupport.mk
@@
-501,6
+501,7
@@
define KernelPackage/sched
CONFIG_NET_SCHED=y \
CONFIG_NET_SCH_DSMARK \
CONFIG_NET_SCH_ESFQ \
CONFIG_NET_SCHED=y \
CONFIG_NET_SCH_DSMARK \
CONFIG_NET_SCH_ESFQ \
+ CONFIG_NET_SCH_ESFQ_NFCT=y \
CONFIG_NET_SCH_FIFO \
CONFIG_NET_SCH_GRED \
CONFIG_NET_SCH_HFSC \
CONFIG_NET_SCH_FIFO \
CONFIG_NET_SCH_GRED \
CONFIG_NET_SCH_HFSC \
@@
-509,7
+510,6
@@
define KernelPackage/sched
CONFIG_NET_SCH_PRIO \
CONFIG_NET_SCH_RED \
CONFIG_NET_SCH_SFQ \
CONFIG_NET_SCH_PRIO \
CONFIG_NET_SCH_RED \
CONFIG_NET_SCH_SFQ \
- CONFIG_NET_SCH_TBF \
CONFIG_NET_SCH_TEQL \
CONFIG_NET_CLS=y \
CONFIG_NET_CLS_ACT=y \
CONFIG_NET_SCH_TEQL \
CONFIG_NET_CLS=y \
CONFIG_NET_CLS_ACT=y \
@@
-520,7
+520,14
@@
define KernelPackage/sched
CONFIG_NET_CLS_TCINDEX \
CONFIG_NET_CLS_U32 \
CONFIG_NET_ACT_MIRRED \
CONFIG_NET_CLS_TCINDEX \
CONFIG_NET_CLS_U32 \
CONFIG_NET_ACT_MIRRED \
- CONFIG_NET_ACT_IPT
+ CONFIG_NET_ACT_IPT \
+ CONFIG_NET_ACT_POLICE \
+ CONFIG_NET_EMATCH \
+ CONFIG_NET_EMATCH_CMP \
+ CONFIG_NET_EMATCH_NBYTE \
+ CONFIG_NET_EMATCH_U32 \
+ CONFIG_NET_EMATCH_META \
+ CONFIG_NET_EMATCH_TEXT
FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
endef
FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
endef
diff --git
a/target/linux/generic-2.6/config-2.6.28
b/target/linux/generic-2.6/config-2.6.28
index f86b92432590051b71efd22478b4ad03b31b1f0f..bf506de6835eef31e12da95733daae236d65de5b 100644
(file)
--- a/
target/linux/generic-2.6/config-2.6.28
+++ b/
target/linux/generic-2.6/config-2.6.28
@@
-1058,17
+1058,15
@@
CONFIG_MTD=y
# CONFIG_NET_ACT_MIRRED is not set
# CONFIG_NET_ACT_NAT is not set
# CONFIG_NET_ACT_PEDIT is not set
# CONFIG_NET_ACT_MIRRED is not set
# CONFIG_NET_ACT_NAT is not set
# CONFIG_NET_ACT_PEDIT is not set
-CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_POLICE is not set
# CONFIG_NET_ACT_SIMP is not set
# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=y
CONFIG_NET_CLS_ACT=y
CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_BASIC=y
# CONFIG_NET_CLS_FLOW is not set
# CONFIG_NET_CLS_FW is not set
CONFIG_NET_CLS_IND=y
# CONFIG_NET_CLS_FLOW is not set
# CONFIG_NET_CLS_FW is not set
CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
# CONFIG_NET_CLS_ROUTE4 is not set
# CONFIG_NET_CLS_ROUTE4 is not set
-CONFIG_NET_CLS_ROUTE=y
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_CLS_RSVP is not set
# CONFIG_NET_CLS_TCINDEX is not set
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_CLS_RSVP is not set
# CONFIG_NET_CLS_TCINDEX is not set
diff --git
a/target/linux/generic-2.6/config-2.6.29
b/target/linux/generic-2.6/config-2.6.29
index 94b4d28aa950623ed3cfbae42fb6bf6cbfe6ee19..c6ffa21648db3717324f734fdf7ba91c1ca87a97 100644
(file)
--- a/
target/linux/generic-2.6/config-2.6.29
+++ b/
target/linux/generic-2.6/config-2.6.29
@@
-1081,17
+1081,15
@@
CONFIG_MTD=y
# CONFIG_NET_ACT_MIRRED is not set
# CONFIG_NET_ACT_NAT is not set
# CONFIG_NET_ACT_PEDIT is not set
# CONFIG_NET_ACT_MIRRED is not set
# CONFIG_NET_ACT_NAT is not set
# CONFIG_NET_ACT_PEDIT is not set
-CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_POLICE is not set
# CONFIG_NET_ACT_SIMP is not set
# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=y
CONFIG_NET_CLS_ACT=y
CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_BASIC=y
# CONFIG_NET_CLS_FLOW is not set
# CONFIG_NET_CLS_FW is not set
CONFIG_NET_CLS_IND=y
# CONFIG_NET_CLS_FLOW is not set
# CONFIG_NET_CLS_FW is not set
CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
# CONFIG_NET_CLS_ROUTE4 is not set
# CONFIG_NET_CLS_ROUTE4 is not set
-CONFIG_NET_CLS_ROUTE=y
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_CLS_RSVP is not set
# CONFIG_NET_CLS_TCINDEX is not set
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_CLS_RSVP is not set
# CONFIG_NET_CLS_TCINDEX is not set
diff --git
a/target/linux/generic-2.6/config-2.6.30
b/target/linux/generic-2.6/config-2.6.30
index 7988ca5861466aceae1a8f52930cc31920d15041..487a68551c9a119712f0456b19c44fa1f4b5c881 100644
(file)
--- a/
target/linux/generic-2.6/config-2.6.30
+++ b/
target/linux/generic-2.6/config-2.6.30
@@
-1122,17
+1122,15
@@
CONFIG_MTD=y
# CONFIG_NET_ACT_MIRRED is not set
# CONFIG_NET_ACT_NAT is not set
# CONFIG_NET_ACT_PEDIT is not set
# CONFIG_NET_ACT_MIRRED is not set
# CONFIG_NET_ACT_NAT is not set
# CONFIG_NET_ACT_PEDIT is not set
-CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_POLICE is not set
# CONFIG_NET_ACT_SIMP is not set
# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=y
CONFIG_NET_CLS_ACT=y
CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_BASIC=y
# CONFIG_NET_CLS_FLOW is not set
# CONFIG_NET_CLS_FW is not set
CONFIG_NET_CLS_IND=y
# CONFIG_NET_CLS_FLOW is not set
# CONFIG_NET_CLS_FW is not set
CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
# CONFIG_NET_CLS_ROUTE4 is not set
# CONFIG_NET_CLS_ROUTE4 is not set
-CONFIG_NET_CLS_ROUTE=y
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_CLS_RSVP is not set
# CONFIG_NET_CLS_TCINDEX is not set
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_CLS_RSVP is not set
# CONFIG_NET_CLS_TCINDEX is not set
diff --git
a/target/linux/generic-2.6/config-2.6.31
b/target/linux/generic-2.6/config-2.6.31
index 7988ca5861466aceae1a8f52930cc31920d15041..487a68551c9a119712f0456b19c44fa1f4b5c881 100644
(file)
--- a/
target/linux/generic-2.6/config-2.6.31
+++ b/
target/linux/generic-2.6/config-2.6.31
@@
-1122,17
+1122,15
@@
CONFIG_MTD=y
# CONFIG_NET_ACT_MIRRED is not set
# CONFIG_NET_ACT_NAT is not set
# CONFIG_NET_ACT_PEDIT is not set
# CONFIG_NET_ACT_MIRRED is not set
# CONFIG_NET_ACT_NAT is not set
# CONFIG_NET_ACT_PEDIT is not set
-CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_POLICE is not set
# CONFIG_NET_ACT_SIMP is not set
# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=y
CONFIG_NET_CLS_ACT=y
CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_BASIC=y
# CONFIG_NET_CLS_FLOW is not set
# CONFIG_NET_CLS_FW is not set
CONFIG_NET_CLS_IND=y
# CONFIG_NET_CLS_FLOW is not set
# CONFIG_NET_CLS_FW is not set
CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
# CONFIG_NET_CLS_ROUTE4 is not set
# CONFIG_NET_CLS_ROUTE4 is not set
-CONFIG_NET_CLS_ROUTE=y
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_CLS_RSVP is not set
# CONFIG_NET_CLS_TCINDEX is not set
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_CLS_RSVP is not set
# CONFIG_NET_CLS_TCINDEX is not set