summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-26 21:13:01 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-26 21:13:01 +0100
commitc48fde9c51983494910925bc4a13cf862f320d38 (patch)
tree1d024def3e43c4544e860a9fcab48707197a29a9 /target/linux/config
parent291a3cf5e1ba11aa9e548a756fe85c51d7b3217f (diff)
parent199f633fb1077c7ffedff161726e9229e7312152 (diff)
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.debug2
-rw-r--r--target/linux/config/Config.in.netfilter.ip416
2 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 019c439d8..a1c7ae6c9 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -34,7 +34,7 @@ config ADK_KERNEL_PRINTK
boolean
select ADK_KERNEL_EARLY_PRINTK
default y
- #depends on !ADK_PKG_TEST
+ depends on !ADK_PKG_TEST
help
Disable printk to save space and quieten bootup.
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index b43a566b9..d3f988845 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -36,16 +36,16 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
config ADK_KPACKAGE_KMOD_FULL_NAT
tristate "Meta package for Full NAT"
- select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30
+ select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_84
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_34
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_14
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_7
config ADK_KPACKAGE_KMOD_NF_NAT
tristate 'Full NAT'
depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
- depends on ADK_KERNEL_VERSION_3_4_82
+ depends on ADK_KERNEL_VERSION_3_4_84
help
The Full NAT option allows masquerading, port forwarding and other
forms of full Network Address Port Translation. It is controlled by
@@ -54,10 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT
config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
tristate 'Full NAT'
depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
- depends on ADK_KERNEL_VERSION_3_10_30 \
+ depends on ADK_KERNEL_VERSION_3_10_34 \
|| ADK_KERNEL_VERSION_3_11_10 \
- || ADK_KERNEL_VERSION_3_12_13 \
- || ADK_KERNEL_VERSION_3_13_6
+ || ADK_KERNEL_VERSION_3_12_14 \
+ || ADK_KERNEL_VERSION_3_13_7
help
The Full NAT option allows masquerading, port forwarding and other
forms of full Network Address Port Translation. It is controlled by