Skip to content
Permalink
Browse files

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>
  • Loading branch information...
xback committed Feb 27, 2019
1 parent fc45ae4 commit 1cfbf95393decf047900e1b66b076a030704db20
Showing with 275 additions and 278 deletions.
  1. +2 −2 include/kernel-version.mk
  2. +1 −1 .../linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
  3. +18 −18 .../linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch
  4. +1 −1 .../linux/generic/backport-4.14/304-v4.16-netfilter-move-checksum-indirection-to-struct-nf_ipv.patch
  5. +1 −1 .../linux/generic/backport-4.14/305-v4.16-netfilter-move-checksum_partial-indirection-to-struc.patch
  6. +2 −2 .../linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch
  7. +1 −1 .../linux/generic/backport-4.14/307-v4.16-netfilter-move-route-indirection-to-struct-nf_ipv6_o.patch
  8. +3 −3 .../linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch
  9. +1 −1 .../linux/generic/backport-4.14/309-v4.16-netfilter-remove-route_key_size-field-in-struct-nf_a.patch
  10. +2 −2 .../linux/generic/backport-4.14/310-v4.16-netfilter-remove-struct-nf_afinfo-and-its-helper-fun.patch
  11. +3 −3 .../linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
  12. +16 −16 ...t/linux/generic/backport-4.14/321-v4.16-netfilter-nf_tables-add-flow-table-netlink-frontend.patch
  13. +2 −2 .../linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
  14. +1 −1 .../linux/generic/backport-4.14/328-v4.16-netfilter-nf_tables-fix-a-typo-in-nf_tables_getflowt.patch
  15. +1 −1 .../linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch
  16. +6 −6 .../linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch
  17. +3 −3 .../linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch
  18. +1 −1 .../linux/generic/backport-4.14/334-v4.15-netfilter-nf_tables-fix-potential-NULL-ptr-deref-in-.patch
  19. +72 −72 .../linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
  20. +2 −2 target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch
  21. +5 −5 target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch
  22. +64 −64 .../linux/generic/backport-4.14/338-v4.16-netfilter-nf_tables-get-rid-of-struct-nft_af_info-ab.patch
  23. +1 −1 .../linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch
  24. +1 −1 target/linux/generic/backport-4.14/342-v4.16-netfilter-nf_tables-fix-flowtable-free.patch
  25. +24 −24 .../linux/generic/backport-4.14/344-v4.16-netfilter-nf_tables-allocate-handle-and-delete-objec.patch
  26. +2 −2 .../linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
  27. +1 −1 .../linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch
  28. +1 −1 .../linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch
  29. +14 −14 target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch
  30. +3 −3 target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
  31. +0 −3 target/linux/ipq40xx/patches-4.14/086-ARM-dts-qcom-ipq4019-enlarge-PCIe-BAR-range.patch
  32. +2 −2 target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
  33. +3 −3 target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch
  34. +5 −5 target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
  35. +4 −4 target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch
  36. +1 −1 target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch
  37. +5 −5 target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
@@ -4,12 +4,12 @@ LINUX_RELEASE?=1

LINUX_VERSION-3.18 = .136
LINUX_VERSION-4.9 = .161
LINUX_VERSION-4.14 = .103
LINUX_VERSION-4.14 = .104
LINUX_VERSION-4.19 = .25

LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c
LINUX_KERNEL_HASH-4.9.161 = e11e830b7e55f9eac768bf3c7617a15da22819552595fe786a1fb20bfa8b28a6
LINUX_KERNEL_HASH-4.14.103 = 7aa43e34e4c9e5965da29cef5ae196e06006f8c0d1d65fd755a2f197f0796a11
LINUX_KERNEL_HASH-4.14.104 = dd430e3e65138da5799b5ff7353e1a9c72f2f9dc957ac53d2aea3dd8ca7be067
LINUX_KERNEL_HASH-4.19.25 = 7ec71d90d6e96e6f741676d157ac06f30c75be4eaf1649143a3c8b7d4f919731

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
@@ -135,7 +135,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
new->hooks[nhooks] = old->hooks[i];
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -1431,6 +1431,8 @@ static int nf_tables_addchain(struct nft
@@ -1434,6 +1434,8 @@ static int nf_tables_addchain(struct nft
ops->hook = hookfn;
if (afi->hook_ops_init)
afi->hook_ops_init(ops, i);
@@ -128,7 +128,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}

static int nft_trans_table_add(struct nft_ctx *ctx, int msg_type)
@@ -624,8 +621,7 @@ static void _nf_tables_table_disable(str
@@ -627,8 +624,7 @@ static void _nf_tables_table_disable(str
if (cnt && i++ == cnt)
break;

@@ -138,7 +138,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
}

@@ -642,8 +638,7 @@ static int nf_tables_table_enable(struct
@@ -645,8 +641,7 @@ static int nf_tables_table_enable(struct
if (!nft_is_base_chain(chain))
continue;

@@ -148,7 +148,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (err < 0)
goto err;

@@ -1055,7 +1050,7 @@ static int nf_tables_fill_chain_info(str
@@ -1058,7 +1053,7 @@ static int nf_tables_fill_chain_info(str

if (nft_is_base_chain(chain)) {
const struct nft_base_chain *basechain = nft_base_chain(chain);
@@ -157,7 +157,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
struct nlattr *nest;

nest = nla_nest_start(skb, NFTA_CHAIN_HOOK);
@@ -1283,8 +1278,8 @@ static void nf_tables_chain_destroy(stru
@@ -1286,8 +1281,8 @@ static void nf_tables_chain_destroy(stru
free_percpu(basechain->stats);
if (basechain->stats)
static_branch_dec(&nft_counters_enabled);
@@ -168,15 +168,15 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
kfree(chain->name);
kfree(basechain);
} else {
@@ -1380,7 +1375,6 @@ static int nf_tables_addchain(struct nft
@@ -1383,7 +1378,6 @@ static int nf_tables_addchain(struct nft
struct nft_stats __percpu *stats;
struct net *net = ctx->net;
struct nft_chain *chain;
- unsigned int i;
int err;

if (table->use == UINT_MAX)
@@ -1419,21 +1413,18 @@ static int nf_tables_addchain(struct nft
@@ -1422,21 +1416,18 @@ static int nf_tables_addchain(struct nft
basechain->type = hook.type;
chain = &basechain->chain;

@@ -210,7 +210,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

chain->flags |= NFT_BASE_CHAIN;
basechain->policy = policy;
@@ -1451,7 +1442,7 @@ static int nf_tables_addchain(struct nft
@@ -1454,7 +1445,7 @@ static int nf_tables_addchain(struct nft
goto err1;
}

@@ -219,7 +219,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (err < 0)
goto err1;

@@ -1465,7 +1456,7 @@ static int nf_tables_addchain(struct nft
@@ -1468,7 +1459,7 @@ static int nf_tables_addchain(struct nft

return 0;
err2:
@@ -228,7 +228,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
err1:
nf_tables_chain_destroy(chain);

@@ -1478,13 +1469,12 @@ static int nf_tables_updchain(struct nft
@@ -1481,13 +1472,12 @@ static int nf_tables_updchain(struct nft
const struct nlattr * const *nla = ctx->nla;
struct nft_table *table = ctx->table;
struct nft_chain *chain = ctx->chain;
@@ -243,7 +243,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

if (nla[NFTA_CHAIN_HOOK]) {
if (!nft_is_base_chain(chain))
@@ -1501,14 +1491,12 @@ static int nf_tables_updchain(struct nft
@@ -1504,14 +1494,12 @@ static int nf_tables_updchain(struct nft
return -EBUSY;
}

@@ -264,7 +264,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
nft_chain_release_hook(&hook);
}
@@ -5129,10 +5117,9 @@ static int nf_tables_commit(struct net *
@@ -5134,10 +5122,9 @@ static int nf_tables_commit(struct net *
case NFT_MSG_DELCHAIN:
list_del_rcu(&trans->ctx.chain->list);
nf_tables_chain_notify(&trans->ctx, NFT_MSG_DELCHAIN);
@@ -278,7 +278,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
break;
case NFT_MSG_NEWRULE:
nft_clear(trans->ctx.net, nft_trans_rule(trans));
@@ -5269,10 +5256,9 @@ static int nf_tables_abort(struct net *n
@@ -5274,10 +5261,9 @@ static int nf_tables_abort(struct net *n
} else {
trans->ctx.table->use--;
list_del_rcu(&trans->ctx.chain->list);
@@ -292,7 +292,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
break;
case NFT_MSG_DELCHAIN:
@@ -5375,7 +5361,7 @@ int nft_chain_validate_hooks(const struc
@@ -5380,7 +5366,7 @@ int nft_chain_validate_hooks(const struc
if (nft_is_base_chain(chain)) {
basechain = nft_base_chain(chain);

@@ -301,7 +301,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
return 0;

return -EOPNOTSUPP;
@@ -5857,8 +5843,7 @@ int __nft_release_basechain(struct nft_c
@@ -5862,8 +5848,7 @@ int __nft_release_basechain(struct nft_c

BUG_ON(!nft_is_base_chain(ctx->chain));

@@ -311,7 +311,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
list_for_each_entry_safe(rule, nr, &ctx->chain->rules, list) {
list_del(&rule->list);
ctx->chain->use--;
@@ -5887,8 +5872,7 @@ static void __nft_release_afinfo(struct
@@ -5892,8 +5877,7 @@ static void __nft_release_afinfo(struct

list_for_each_entry_safe(table, nt, &afi->tables, list) {
list_for_each_entry(chain, &table->chains, list)
@@ -361,7 +361,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

par->hook_mask = 1 << ops->hooknum;
} else {
@@ -317,7 +317,7 @@ static int nft_target_validate(const str
@@ -318,7 +318,7 @@ static int nft_target_validate(const str
if (nft_is_base_chain(ctx->chain)) {
const struct nft_base_chain *basechain =
nft_base_chain(ctx->chain);
@@ -370,7 +370,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

hook_mask = 1 << ops->hooknum;
if (target->hooks && !(hook_mask & target->hooks))
@@ -414,7 +414,7 @@ nft_match_set_mtchk_param(struct xt_mtch
@@ -415,7 +415,7 @@ nft_match_set_mtchk_param(struct xt_mtch
if (nft_is_base_chain(ctx->chain)) {
const struct nft_base_chain *basechain =
nft_base_chain(ctx->chain);
@@ -379,7 +379,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

par->hook_mask = 1 << ops->hooknum;
} else {
@@ -565,7 +565,7 @@ static int nft_match_validate(const stru
@@ -566,7 +566,7 @@ static int nft_match_validate(const stru
if (nft_is_base_chain(ctx->chain)) {
const struct nft_base_chain *basechain =
nft_base_chain(ctx->chain);
@@ -116,7 +116,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
.saveroute = nf_ip_saveroute,
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -194,12 +194,12 @@ static __sum16 nf_ip6_checksum_partial(s
@@ -196,12 +196,12 @@ static __sum16 nf_ip6_checksum_partial(s
static const struct nf_ipv6_ops ipv6ops = {
.chk_addr = ipv6_chk_addr,
.route_input = ip6_route_input,
@@ -151,7 +151,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
.reroute = nf_ip_reroute,
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -192,15 +192,15 @@ static __sum16 nf_ip6_checksum_partial(s
@@ -194,15 +194,15 @@ static __sum16 nf_ip6_checksum_partial(s
};

static const struct nf_ipv6_ops ipv6ops = {
@@ -125,7 +125,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
};
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -70,31 +70,6 @@ int ip6_route_me_harder(struct net *net,
@@ -72,31 +72,6 @@ int ip6_route_me_harder(struct net *net,
}
EXPORT_SYMBOL(ip6_route_me_harder);

@@ -157,7 +157,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
static int nf_ip6_reroute(struct net *net, struct sk_buff *skb,
const struct nf_queue_entry *entry)
{
@@ -202,7 +177,6 @@ static const struct nf_ipv6_ops ipv6ops
@@ -204,7 +179,6 @@ static const struct nf_ipv6_ops ipv6ops
static const struct nf_afinfo nf_ip6_afinfo = {
.family = AF_INET6,
.route = nf_ip6_route,
@@ -114,7 +114,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
};
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -172,11 +172,11 @@ static const struct nf_ipv6_ops ipv6ops
@@ -174,11 +174,11 @@ static const struct nf_ipv6_ops ipv6ops
.fragment = ip6_fragment,
.checksum = nf_ip6_checksum,
.checksum_partial = nf_ip6_checksum_partial,
@@ -138,7 +138,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -70,7 +70,7 @@ int ip6_route_me_harder(struct net *net,
@@ -72,7 +72,7 @@ int ip6_route_me_harder(struct net *net,
}
EXPORT_SYMBOL(ip6_route_me_harder);

@@ -147,7 +147,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
const struct nf_queue_entry *entry)
{
struct ip6_rt_info *rt_info = nf_queue_entry_reroute(entry);
@@ -80,7 +80,7 @@ static int nf_ip6_reroute(struct net *ne
@@ -82,7 +82,7 @@ static int nf_ip6_reroute(struct net *ne
if (!ipv6_addr_equal(&iph->daddr, &rt_info->daddr) ||
!ipv6_addr_equal(&iph->saddr, &rt_info->saddr) ||
skb->mark != rt_info->mark)
@@ -156,7 +156,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
return 0;
}
@@ -173,11 +173,11 @@ static const struct nf_ipv6_ops ipv6ops
@@ -175,11 +175,11 @@ static const struct nf_ipv6_ops ipv6ops
.checksum = nf_ip6_checksum,
.checksum_partial = nf_ip6_checksum_partial,
.route = nf_ip6_route,
@@ -29,7 +29,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
static int __init ipv4_netfilter_init(void)
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -178,7 +178,6 @@ static const struct nf_ipv6_ops ipv6ops
@@ -180,7 +180,6 @@ static const struct nf_ipv6_ops ipv6ops

static const struct nf_afinfo nf_ip6_afinfo = {
.family = AF_INET6,
@@ -102,7 +102,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-subsys_initcall(ipv4_netfilter_init);
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -176,14 +176,10 @@ static const struct nf_ipv6_ops ipv6ops
@@ -178,14 +178,10 @@ static const struct nf_ipv6_ops ipv6ops
.reroute = nf_ip6_reroute,
};

@@ -118,7 +118,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}

/* This can be called from inet6_init() on errors, so it cannot
@@ -192,5 +188,4 @@ int __init ipv6_netfilter_init(void)
@@ -194,5 +190,4 @@ int __init ipv6_netfilter_init(void)
void ipv6_netfilter_fini(void)
{
RCU_INIT_POINTER(nf_ipv6_ops, NULL);
@@ -151,23 +151,23 @@ 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;
- nf_hookfn *hookfn;

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);
}

- hookfn = hook.type->hooks[hook.num];
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;

0 comments on commit 1cfbf95

Please sign in to comment.
You can’t perform that action at this time.