diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-12-18 13:00:45 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-12-18 14:24:57 +0100 |
commit | 9f2739e92471c4dfd4a56efec6bce90860dba946 (patch) | |
tree | 1a9a4e0f5fe7dfaffd38b75c01f531c90f318291 /target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch | |
parent | dd0a213bedd2f751fef1b1b9212192b31b92dee5 (diff) | |
download | upstream-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/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch index 2cf8cea23c..3cc644a530 100644 --- a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch +++ b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch @@ -236,7 +236,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> .owner = THIS_MODULE, --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5081,40 +5081,38 @@ static int nf_tables_newflowtable(struct +@@ -5075,40 +5075,38 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -285,7 +285,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> err3: module_put(type->owner); err2: -@@ -5395,10 +5393,8 @@ err: +@@ -5389,10 +5387,8 @@ err: static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable) { |