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-12-18 13:00:45 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-18 14:24:57 +0100
commit9f2739e92471c4dfd4a56efec6bce90860dba946 (patch)
tree1a9a4e0f5fe7dfaffd38b75c01f531c90f318291 /target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch
parentdd0a213bedd2f751fef1b1b9212192b31b92dee5 (diff)
downloadupstream-9f2739e92471c4dfd4a56efec6bce90860dba946.tar.gz
upstream-9f2739e92471c4dfd4a56efec6bce90860dba946.tar.bz2
upstream-9f2739e92471c4dfd4a56efec6bce90860dba946.zip
kernel: bump 4.14 to 4.14.89
Refreshed all patches. Remove upstreamed patches: - 096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch Compile-tested on: ar71xx, cns3xxx, imx6 Runtime-tested on: ar71xx, cns3xxx, imx6 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 d978a076fd..d78f8003aa 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
-@@ -4947,7 +4947,7 @@ static int nf_tables_flowtable_parse_hoo
+@@ -4941,7 +4941,7 @@ static int nf_tables_flowtable_parse_hoo
flowtable->ops[i].pf = NFPROTO_NETDEV;
flowtable->ops[i].hooknum = hooknum;
flowtable->ops[i].priority = priority;