diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-27 17:07:48 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-05 13:19:43 +0100 |
| commit | 1cfbf95393decf047900e1b66b076a030704db20 (patch) | |
| tree | 8087326ea9c0d8885763999944c258fdd5b742f4 /target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch | |
| parent | fc45ae44613b41f7328e81d0999f609dd7e81482 (diff) | |
| download | openwrt-1cfbf95393decf047900e1b66b076a030704db20.tar.gz openwrt-1cfbf95393decf047900e1b66b076a030704db20.tar.bz2 openwrt-1cfbf95393decf047900e1b66b076a030704db20.zip | |
kernel: bump 4.14 to 4.14.104
Refreshed all patches.
Altered patches:
- 332-arc-add-OWRTDTB-section.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
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.patch | 6 |
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 3ee8ad9d33..f4c3a48ead 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 @@ -151,7 +151,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static int __init nf_tables_ipv6_init(void) --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -1383,7 +1383,6 @@ static int nf_tables_addchain(struct nft +@@ -1386,7 +1386,6 @@ static int nf_tables_addchain(struct nft if (nla[NFTA_CHAIN_HOOK]) { struct nft_chain_hook hook; struct nf_hook_ops *ops; @@ -159,7 +159,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> err = nft_chain_parse_hook(net, nla, afi, &hook, create); if (err < 0) -@@ -1409,7 +1408,6 @@ static int nf_tables_addchain(struct nft +@@ -1412,7 +1411,6 @@ static int nf_tables_addchain(struct nft static_branch_inc(&nft_counters_enabled); } @@ -167,7 +167,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> basechain->type = hook.type; chain = &basechain->chain; -@@ -1418,10 +1416,8 @@ static int nf_tables_addchain(struct nft +@@ -1421,10 +1419,8 @@ static int nf_tables_addchain(struct nft ops->hooknum = hook.num; ops->priority = hook.priority; ops->priv = chain; |