summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-09-27 16:23:25 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-09-28 00:36:22 +0200
commit1da8cc1bbc251ad68cad01456e427d97f9c61cbd (patch)
tree25497fc3d67e8aa33948c841411f5eaaef763fe0 /target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
parent1238a22316ea5f71e77691f0557297340bc72d2f (diff)
downloadopenwrt-1da8cc1bbc251ad68cad01456e427d97f9c61cbd.tar.gz
openwrt-1da8cc1bbc251ad68cad01456e427d97f9c61cbd.tar.bz2
openwrt-1da8cc1bbc251ad68cad01456e427d97f9c61cbd.zip
kernel: Update kernel 4.14 to version 4.14.199
Compile and runtime tested on x86/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch')
-rw-r--r--target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch b/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
index a12679db43..dbfc2eb30c 100644
--- a/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
+++ b/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
@@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
-@@ -876,7 +876,7 @@ enum nft_chain_type {
+@@ -878,7 +878,7 @@ enum nft_chain_type {
* @family: address family
* @owner: module owner
* @hook_mask: mask of valid hooks
@@ -19,7 +19,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
*/
struct nf_chain_type {
const char *name;
-@@ -970,7 +970,6 @@ enum nft_af_flags {
+@@ -972,7 +972,6 @@ enum nft_af_flags {
* @owner: module owner
* @tables: used internally
* @flags: family flags
@@ -27,7 +27,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
*/
struct nft_af_info {
struct list_head list;
-@@ -979,7 +978,6 @@ struct nft_af_info {
+@@ -981,7 +980,6 @@ struct nft_af_info {
struct module *owner;
struct list_head tables;
u32 flags;