aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-07-12 00:01:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-07-12 00:01:12 +0000
commit2020fc8c568d3adba46315b8ad32c4f258694adb (patch)
tree1cce9057d71b394a966187258f681e7c233641c8
parentbcbdd2a425f2849a15547671e98f01ae967bd78f (diff)
downloadupstream-2020fc8c568d3adba46315b8ad32c4f258694adb.tar.gz
upstream-2020fc8c568d3adba46315b8ad32c4f258694adb.tar.bz2
upstream-2020fc8c568d3adba46315b8ad32c4f258694adb.zip
kernel: clean up scheduler default config and kmod-sched kconfig symbols, enable skbedit by default
SVN-Revision: 16789
-rw-r--r--package/kernel/modules/netsupport.mk11
-rw-r--r--target/linux/generic-2.6/config-2.6.288
-rw-r--r--target/linux/generic-2.6/config-2.6.298
-rw-r--r--target/linux/generic-2.6/config-2.6.308
-rw-r--r--target/linux/generic-2.6/config-2.6.318
5 files changed, 21 insertions, 22 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index e848037f81..04cdb061fc 100644
--- 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_SCH_ESFQ_NFCT=y \
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_TBF \
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_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
diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index f86b924325..bf506de683 100644
--- 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_POLICE=y
+# CONFIG_NET_ACT_POLICE 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_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_POLICE=y
# 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
diff --git a/target/linux/generic-2.6/config-2.6.29 b/target/linux/generic-2.6/config-2.6.29
index 94b4d28aa9..c6ffa21648 100644
--- 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_POLICE=y
+# CONFIG_NET_ACT_POLICE 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_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_POLICE=y
# 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
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 7988ca5861..487a68551c 100644
--- 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_POLICE=y
+# CONFIG_NET_ACT_POLICE 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_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_POLICE=y
# 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
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 7988ca5861..487a68551c 100644
--- 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_POLICE=y
+# CONFIG_NET_ACT_POLICE 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_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_POLICE=y
# 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