diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-11 14:58:36 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-12 13:54:24 +0200 |
commit | ca903c73c70592fc49649235770fa49823efab96 (patch) | |
tree | cd9f9fc2eadb0b8ff3aa121c1537753bf7b5a9f0 /target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch | |
parent | 3a5498c5e55d3fad5df14d94366e331642f0eb77 (diff) | |
download | upstream-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/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 278947644f..2af2fbe284 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 -@@ -5020,40 +5020,38 @@ static int nf_tables_newflowtable(struct +@@ -5063,40 +5063,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: -@@ -5334,10 +5332,8 @@ err: +@@ -5377,10 +5375,8 @@ err: static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable) { |