kernel: disable scheduler actions by default, they will be enabled only when kmod...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25771 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index c860034..0988ba8 100644 (file)
--- 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 c0f421c..a1b8046 100644 (file)
--- 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 747f411..d457bd8 100644 (file)
--- 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 c72170c..bd9f5f2 100644 (file)
--- 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 3ed4194..2198b0d 100644 (file)
--- 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 be7d283..5f7a097 100644 (file)
--- 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 0a5b96d..fcad5f5 100644 (file)
--- 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 5147f9c..ddbe04a 100644 (file)
--- 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 76efed5..464a04b 100644 (file)
--- 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