target/linux/layerscape/patches-5.4/701-net-0116-sdk_dpaa-ceetm-align-to-upstream-API-changes.patch

   1 From 17a9864b376f8ad0e19736ce53a3d7798679a0b8 Mon Sep 17 00:00:00 2001
   2 From: Camelia Groza <camelia.groza@nxp.com>
   3 Date: Wed, 3 Jul 2019 15:27:01 +0300
   4 Subject: [PATCH] sdk_dpaa: ceetm: align to upstream API changes
   5
   6 Align to the following upstream patches:
   7 8cb0817 netlink: make validation more configurable for future strictness
   8 ae0be8d netlink: make nla_nest_start() add NLA_F_NESTED flag
   9
  10 Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
  11 ---
  12  drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c | 10 +++++-----
  13  1 file changed, 5 insertions(+), 5 deletions(-)
  14
  15 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
  16 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
  17 @@ -650,7 +650,7 @@ static int ceetm_dump(struct Qdisc *sch,
  18                 return -EINVAL;
  19         }
  20
  21 -       nest = nla_nest_start(skb, TCA_OPTIONS);
  22 +       nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
  23         if (!nest)
  24                 goto nla_put_failure;
  25         if (nla_put(skb, TCA_CEETM_QOPS, sizeof(qopt), &qopt))
  26 @@ -1133,7 +1133,7 @@ static int ceetm_init(struct Qdisc *sch,
  27         if (ret)
  28                 return ret;
  29
  30 -       ret = nla_parse_nested(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
  31 +       ret = nla_parse_nested_deprecated(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
  32         if (ret < 0) {
  33                 pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
  34                 return ret;
  35 @@ -1307,7 +1307,7 @@ static int ceetm_change(struct Qdisc *sc
  36
  37         pr_debug(KBUILD_BASENAME " : %s : qdisc %X\n", __func__, sch->handle);
  38
  39 -       ret = nla_parse_nested(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
  40 +       ret = nla_parse_nested_deprecated(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
  41         if (ret < 0) {
  42                 pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
  43                 return ret;
  44 @@ -1527,7 +1527,7 @@ static int ceetm_cls_change(struct Qdisc
  45                 return -EINVAL;
  46         }
  47
  48 -       err = nla_parse_nested(tb, TCA_CEETM_COPT, opt, ceetm_policy, NULL);
  49 +       err = nla_parse_nested_deprecated(tb, TCA_CEETM_COPT, opt, ceetm_policy, NULL);
  50         if (err < 0) {
  51                 pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
  52                 return -EINVAL;
  53 @@ -1728,7 +1728,7 @@ static int ceetm_cls_dump(struct Qdisc *
  54                 break;
  55         }
  56
  57 -       nest = nla_nest_start(skb, TCA_OPTIONS);
  58 +       nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
  59         if (!nest)
  60                 goto nla_put_failure;
  61         if (nla_put(skb, TCA_CEETM_COPT, sizeof(copt), &copt))