diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-28 16:10:40 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-28 23:05:39 +0200 |
| commit | 01793e8752aa8211d6d74c92722787c403e5420d (patch) | |
| tree | 41673c27be0d69da5acd411740590e99a5cff195 /target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch | |
| parent | 22f899c6dd62c946db419a5195fd99c7a079bd9c (diff) | |
| download | upstream-01793e8752aa8211d6d74c92722787c403e5420d.tar.gz upstream-01793e8752aa8211d6d74c92722787c403e5420d.tar.bz2 upstream-01793e8752aa8211d6d74c92722787c403e5420d.zip | |
kernel: bump 4.14 to 4.14.67
Refreshed all patches.
Removed upstreamed patches:
- 037-v4.18-0008-ARM-dts-BCM5301x-Fix-i2c-controller-interrupt-type.patch
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch b/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch index 320a90c11c..47ba98c191 100644 --- a/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch +++ b/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch @@ -1280,8 +1280,8 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> - family = ctx->afi->family; + family = ctx->family; - /* Re-use the existing target if it's already loaded. */ - list_for_each_entry(nft_target, &nft_target_list, head) { + if (strcmp(tg_name, XT_ERROR_TARGET) == 0 || + strcmp(tg_name, XT_STANDARD_TARGET) == 0 || --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -405,7 +405,7 @@ static int nft_ct_get_init(const struct |