From: Felix Fietkau Date: Sun, 27 Feb 2011 19:52:57 +0000 (+0000) Subject: kernel: disable scheduler actions by default, they will be enabled only when kmod... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=875c8353f6781dc5040d953ff39e249c5f0fa16b;p=openwrt%2Fstaging%2Frmilecki.git kernel: disable scheduler actions by default, they will be enabled only when kmod-sched is selected SVN-Revision: 25771 --- diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index c86003417d3..0988ba82356 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -552,6 +552,7 @@ define KernelPackage/sched CONFIG_NET_ACT_IPT \ CONFIG_NET_ACT_POLICE \ CONFIG_NET_ACT_CONNMARK \ + CONFIG_NET_ACT_SKBEDIT \ CONFIG_NET_EMATCH=y \ CONFIG_NET_EMATCH_CMP \ CONFIG_NET_EMATCH_NBYTE \ diff --git a/target/linux/generic/config-2.6.30 b/target/linux/generic/config-2.6.30 index c0f421c187f..a1b80461c91 100644 --- a/target/linux/generic/config-2.6.30 +++ b/target/linux/generic/config-2.6.30 @@ -1370,10 +1370,10 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NET_ACT_PEDIT is not set # CONFIG_NET_ACT_POLICE is not set # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_SKBEDIT is not set CONFIG_NET_CLS=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=y +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_BASIC is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_FW is not set CONFIG_NET_CLS_IND=y diff --git a/target/linux/generic/config-2.6.31 b/target/linux/generic/config-2.6.31 index 747f411df0c..d457bd8d7aa 100644 --- a/target/linux/generic/config-2.6.31 +++ b/target/linux/generic/config-2.6.31 @@ -1367,10 +1367,10 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NET_ACT_PEDIT is not set # CONFIG_NET_ACT_POLICE is not set # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_SKBEDIT is not set CONFIG_NET_CLS=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=y +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_BASIC is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_FW is not set CONFIG_NET_CLS_IND=y diff --git a/target/linux/generic/config-2.6.32 b/target/linux/generic/config-2.6.32 index c72170c59bd..bd9f5f24bd3 100644 --- a/target/linux/generic/config-2.6.32 +++ b/target/linux/generic/config-2.6.32 @@ -1450,10 +1450,10 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NET_ACT_PEDIT is not set # CONFIG_NET_ACT_POLICE is not set # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_SKBEDIT is not set CONFIG_NET_CLS=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=y +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_BASIC is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_FW is not set CONFIG_NET_CLS_IND=y diff --git a/target/linux/generic/config-2.6.34 b/target/linux/generic/config-2.6.34 index 3ed4194a650..2198b0dcfc3 100644 --- a/target/linux/generic/config-2.6.34 +++ b/target/linux/generic/config-2.6.34 @@ -1532,10 +1532,10 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NET_ACT_PEDIT is not set # CONFIG_NET_ACT_POLICE is not set # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_SKBEDIT is not set CONFIG_NET_CLS=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=y +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_BASIC is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_FW is not set CONFIG_NET_CLS_IND=y diff --git a/target/linux/generic/config-2.6.35 b/target/linux/generic/config-2.6.35 index be7d283bed9..5f7a0975255 100644 --- a/target/linux/generic/config-2.6.35 +++ b/target/linux/generic/config-2.6.35 @@ -1596,10 +1596,10 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NET_ACT_PEDIT is not set # CONFIG_NET_ACT_POLICE is not set # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_SKBEDIT is not set CONFIG_NET_CLS=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=y +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_BASIC is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_FW is not set CONFIG_NET_CLS_IND=y diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36 index 0a5b96d200a..fcad5f5c6c6 100644 --- a/target/linux/generic/config-2.6.36 +++ b/target/linux/generic/config-2.6.36 @@ -1489,10 +1489,10 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NET_ACT_PEDIT is not set # CONFIG_NET_ACT_POLICE is not set # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_SKBEDIT is not set CONFIG_NET_CLS=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=y +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_BASIC is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_FW is not set CONFIG_NET_CLS_IND=y diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37 index 5147f9c4454..ddbe04ae477 100644 --- a/target/linux/generic/config-2.6.37 +++ b/target/linux/generic/config-2.6.37 @@ -1524,10 +1524,10 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NET_ACT_PEDIT is not set # CONFIG_NET_ACT_POLICE is not set # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_SKBEDIT is not set CONFIG_NET_CLS=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=y +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_BASIC is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_FW is not set CONFIG_NET_CLS_IND=y diff --git a/target/linux/generic/config-2.6.38 b/target/linux/generic/config-2.6.38 index 76efed5cb29..464a04b6d20 100644 --- a/target/linux/generic/config-2.6.38 +++ b/target/linux/generic/config-2.6.38 @@ -1538,10 +1538,10 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NET_ACT_PEDIT is not set # CONFIG_NET_ACT_POLICE is not set # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_SKBEDIT is not set CONFIG_NET_CLS=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=y +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_BASIC is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_FW is not set CONFIG_NET_CLS_IND=y