summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Hatch <Jeff.Hatch@multitech.com>2018-02-16 11:45:07 -0600
committerJohn Klug <john.klug@multitech.com>2018-03-01 12:36:00 -0600
commit4d8a3b5b9380b7b79801396742a4cf52d879dd50 (patch)
tree548c84c0c49fb995671ccbad564565ebb890bab3
parentbe3c17cf35b5c6ed41e01c35f5b044dd38320b0c (diff)
downloadmeta-multitech-4d8a3b5b9380b7b79801396742a4cf52d879dd50.tar.gz
meta-multitech-4d8a3b5b9380b7b79801396742a4cf52d879dd50.tar.bz2
meta-multitech-4d8a3b5b9380b7b79801396742a4cf52d879dd50.zip
IN002940 add NFLOG and TPROXY settings to kernel for CONFIG_NETFILTER_XT_TARGET, and update kernel rev to 15
-rw-r--r--recipes-kernel/linux/linux-3.12.27/mtcap/defconfig4
-rw-r--r--recipes-kernel/linux/linux-3.12.27/mtcdt/defconfig4
-rw-r--r--recipes-kernel/linux/linux_3.12.27.bb2
3 files changed, 5 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-3.12.27/mtcap/defconfig b/recipes-kernel/linux/linux-3.12.27/mtcap/defconfig
index 62857f4..d74114b 100644
--- a/recipes-kernel/linux/linux-3.12.27/mtcap/defconfig
+++ b/recipes-kernel/linux/linux-3.12.27/mtcap/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.27/mtcdt/defconfig b/recipes-kernel/linux/linux-3.12.27/mtcdt/defconfig
index 2f1b690..bfe38ce 100644
--- a/recipes-kernel/linux/linux-3.12.27/mtcdt/defconfig
+++ b/recipes-kernel/linux/linux-3.12.27/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.27.bb b/recipes-kernel/linux/linux_3.12.27.bb
index d74163b..30e3289 100644
--- a/recipes-kernel/linux/linux_3.12.27.bb
+++ b/recipes-kernel/linux/linux_3.12.27.bb
@@ -2,7 +2,7 @@ inherit kernel
# mts class to build dtb and append to kernel image
inherit linux-append-dtb
-PR = "r14"
+PR = "r15"
# New revision level for Blueborne
PR_kernel-module-bluetooth = "r14.m1"