summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Hatch <Jeff.Hatch@multitech.com>2018-02-16 12:01:42 -0600
committerJeff Hatch <Jeff.Hatch@multitech.com>2018-02-16 12:01:42 -0600
commit842ebc4e355a9f6636c5170f477f7f84f743456d (patch)
tree82e4c7878c60e622dc2063e5f72da0937fa87fb4
parent709bb1c70fe899623830c830a87cbd33f5a1c54b (diff)
downloadmeta-multitech-842ebc4e355a9f6636c5170f477f7f84f743456d.tar.gz
meta-multitech-842ebc4e355a9f6636c5170f477f7f84f743456d.tar.bz2
meta-multitech-842ebc4e355a9f6636c5170f477f7f84f743456d.zip
IN002940 add NFLOG and TPROXY settings to kernel for CONFIG_NETFILTER_XT_TARGET, and update kernel rev to 18
-rw-r--r--recipes-kernel/linux/linux-3.12.70/mtcap/defconfig4
-rw-r--r--recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig4
-rw-r--r--recipes-kernel/linux/linux_3.12.70.bb2
3 files changed, 5 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-3.12.70/mtcap/defconfig b/recipes-kernel/linux/linux-3.12.70/mtcap/defconfig
index 3fa7f34..4ec409f 100644
--- a/recipes-kernel/linux/linux-3.12.70/mtcap/defconfig
+++ b/recipes-kernel/linux/linux-3.12.70/mtcap/defconfig
@@ -619,13 +619,13 @@ CONFIG_NETFILTER_XT_TARGET_HL=m
CONFIG_NETFILTER_XT_TARGET_LOG=y
CONFIG_NETFILTER_XT_TARGET_MARK=y
CONFIG_NETFILTER_XT_TARGET_NETMAP=y
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
CONFIG_NETFILTER_XT_TARGET_TEE=m
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
diff --git a/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig b/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig
index d492628..e147d80 100644
--- a/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig
+++ b/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig
@@ -618,13 +618,13 @@ CONFIG_NETFILTER_XT_TARGET_HL=m
CONFIG_NETFILTER_XT_TARGET_LOG=y
CONFIG_NETFILTER_XT_TARGET_MARK=y
CONFIG_NETFILTER_XT_TARGET_NETMAP=y
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
CONFIG_NETFILTER_XT_TARGET_TEE=m
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
diff --git a/recipes-kernel/linux/linux_3.12.70.bb b/recipes-kernel/linux/linux_3.12.70.bb
index fd93cdd..4440e22 100644
--- a/recipes-kernel/linux/linux_3.12.70.bb
+++ b/recipes-kernel/linux/linux_3.12.70.bb
@@ -2,7 +2,7 @@ inherit kernel
# mts class to build dtb and append to kernel image
inherit linux-append-dtb
-PR = "r17"
+PR = "r18"
PR_kernel_module_bluetooth = "r17.m1"
LICENSE = "GPLv2"