diff options
author | Stijn Segers <foss@volatilesystems.org> | 2018-06-29 22:29:06 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2018-07-02 07:06:23 +0200 |
commit | ab7cabd09df542cf3558725573c2ef2cf1c7cdff (patch) | |
tree | 791b3f74b7c5e60f1409836871287337f4cf0e38 /target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch | |
parent | c96b344466fc80cb5815eeab87c6ca9a29fb9207 (diff) | |
download | upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.gz upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.bz2 upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.zip |
kernel: bump 4.14 to 4.14.52 for 18.06
Compile-tested on: ramips/mt7621, x86/64.
Run-tested on: ramips/mt7621.
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch')
-rw-r--r-- | target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch index 7f78d521f8..84ae4affe3 100644 --- a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch +++ b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch @@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> depends on !NF_CONNTRACK || NF_CONNTRACK --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig -@@ -69,7 +69,6 @@ config NFT_FIB_IPV6 +@@ -97,7 +97,6 @@ config NFT_FIB_IPV6 multicast or blackhole. endif # NF_TABLES_IPV6 @@ -36,7 +36,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> config NF_FLOW_TABLE_IPV6 tristate "Netfilter flow table IPv6 module" -@@ -79,6 +78,8 @@ config NF_FLOW_TABLE_IPV6 +@@ -107,6 +106,8 @@ config NF_FLOW_TABLE_IPV6 To compile it as a module, choose M here. |