aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-07-11 14:58:36 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-07-12 13:54:24 +0200
commitca903c73c70592fc49649235770fa49823efab96 (patch)
treecd9f9fc2eadb0b8ff3aa121c1537753bf7b5a9f0 /target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch
parent3a5498c5e55d3fad5df14d94366e331642f0eb77 (diff)
downloadupstream-ca903c73c70592fc49649235770fa49823efab96.tar.gz
upstream-ca903c73c70592fc49649235770fa49823efab96.tar.bz2
upstream-ca903c73c70592fc49649235770fa49823efab96.zip
kernel: bump 4.14 to 4.14.54 for 18.06
Refreshed all patches Reworked patches to match upstream: 335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch')
-rw-r--r--target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch b/target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch
index fcf206de37..9481d16ba5 100644
--- a/target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch
+++ b/target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -4886,7 +4886,7 @@ static int nf_tables_flowtable_parse_hoo
+@@ -4929,7 +4929,7 @@ static int nf_tables_flowtable_parse_hoo
flowtable->ops[i].pf = NFPROTO_NETDEV;
flowtable->ops[i].hooknum = hooknum;
flowtable->ops[i].priority = priority;