diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-09-27 15:41:08 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-09-28 01:04:35 +0200 |
| commit | d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c (patch) | |
| tree | 0e63ada8a8ad318c076068ae2bb14d530f53604a /target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch | |
| parent | 86b44028e2123a199d9ff9cfc1585696bed7af53 (diff) | |
| download | upstream-d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c.tar.gz upstream-d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c.tar.bz2 upstream-d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c.zip | |
kernel: Update to version 4.14.199
Compile and runtime tested on lantiq/xrx200 + ath79/generic.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 96acb6887e..44838837e9 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 -@@ -5108,40 +5108,38 @@ static int nf_tables_newflowtable(struct +@@ -5109,40 +5109,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: -@@ -5422,10 +5420,8 @@ err: +@@ -5423,10 +5421,8 @@ err: static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable) { |