From d7f87c9aaebfa2dd9422b633df517304b1049c79 Mon Sep 17 00:00:00 2001 From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Sun, 12 Jul 2009 00:01:12 +0000 Subject: [PATCH] kernel: clean up scheduler default config and kmod-sched kconfig symbols, enable skbedit by default git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16789 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netsupport.mk | 11 +++++++++-- target/linux/generic-2.6/config-2.6.28 | 8 +++----- target/linux/generic-2.6/config-2.6.29 | 8 +++----- target/linux/generic-2.6/config-2.6.30 | 8 +++----- target/linux/generic-2.6/config-2.6.31 | 8 +++----- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index e848037f8..04cdb061f 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 f86b92432..bf506de68 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 94b4d28aa..c6ffa2164 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 7988ca586..487a68551 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 7988ca586..487a68551 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 -- 2.20.1