target/linux/layerscape/patches-5.4/701-net-0062-sdk_dpa-adapt-ceetm-code-to-new-kernel-API.patch

   1 From 4026225a854760fa355e393a386b6c96d794bce2 Mon Sep 17 00:00:00 2001
   2 From: Madalin Bucur <madalin.bucur@nxp.com>
   3 Date: Tue, 24 Apr 2018 17:07:25 +0300
   4 Subject: [PATCH] sdk_dpa: adapt ceetm code to new kernel API
   5
   6 Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
   7 ---
   8  .../ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c   | 26 +++++++++++++---------
   9  1 file changed, 16 insertions(+), 10 deletions(-)
  10
  11 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
  12 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
  13 @@ -577,7 +577,8 @@ nla_put_failure:
  14
  15  /* Configure a root ceetm qdisc */
  16  static int ceetm_init_root(struct Qdisc *sch, struct ceetm_qdisc *priv,
  17 -                          struct tc_ceetm_qopt *qopt)
  18 +                          struct tc_ceetm_qopt *qopt,
  19 +                          struct netlink_ext_ack *extack)
  20  {
  21         struct netdev_queue *dev_queue;
  22         struct Qdisc *qdisc;
  23 @@ -622,7 +623,7 @@ static int ceetm_init_root(struct Qdisc
  24                                       TC_H_MIN(i + PFIFO_MIN_OFFSET));
  25
  26                 qdisc = qdisc_create_dflt(dev_queue, &pfifo_qdisc_ops,
  27 -                                         parent_id);
  28 +                                         parent_id, extack);
  29                 if (!qdisc) {
  30                         err = -ENOMEM;
  31                         goto err_init_root;
  32 @@ -1035,7 +1036,8 @@ err_init_wbfs:
  33  }
  34
  35  /* Configure a generic ceetm qdisc */
  36 -static int ceetm_init(struct Qdisc *sch, struct nlattr *opt)
  37 +static int ceetm_init(struct Qdisc *sch, struct nlattr *opt,
  38 +                     struct netlink_ext_ack *extack)
  39  {
  40         struct tc_ceetm_qopt *qopt;
  41         struct nlattr *tb[TCA_CEETM_QOPS + 1];
  42 @@ -1053,7 +1055,7 @@ static int ceetm_init(struct Qdisc *sch,
  43                 return -EINVAL;
  44         }
  45
  46 -       ret = tcf_block_get(&priv->block, &priv->filter_list, sch);
  47 +       ret = tcf_block_get(&priv->block, &priv->filter_list, sch, extack);
  48         if (ret)
  49                 return ret;
  50
  51 @@ -1087,7 +1089,7 @@ static int ceetm_init(struct Qdisc *sch,
  52
  53         switch (priv->type) {
  54         case CEETM_ROOT:
  55 -               ret = ceetm_init_root(sch, priv, qopt);
  56 +               ret = ceetm_init_root(sch, priv, qopt, extack);
  57                 break;
  58         case CEETM_PRIO:
  59                 ret = ceetm_init_prio(sch, priv, qopt);
  60 @@ -1224,7 +1226,8 @@ change_err:
  61  }
  62
  63  /* Edit a ceetm qdisc */
  64 -static int ceetm_change(struct Qdisc *sch, struct nlattr *opt)
  65 +static int ceetm_change(struct Qdisc *sch, struct nlattr *opt,
  66 +                       struct netlink_ext_ack *extack)
  67  {
  68         struct tc_ceetm_qopt *qopt;
  69         struct nlattr *tb[TCA_CEETM_QOPS + 1];
  70 @@ -1410,7 +1413,8 @@ static int ceetm_cls_change_wbfs(struct
  71
  72  /* Add a ceetm root class or configure a ceetm root/prio/wbfs class */
  73  static int ceetm_cls_change(struct Qdisc *sch, u32 classid, u32 parentid,
  74 -                           struct nlattr **tca, unsigned long *arg)
  75 +                           struct nlattr **tca, unsigned long *arg,
  76 +                           struct netlink_ext_ack *extack)
  77  {
  78         int err;
  79         u64 bps;
  80 @@ -1505,7 +1509,7 @@ static int ceetm_cls_change(struct Qdisc
  81         if (!cl)
  82                 return -ENOMEM;
  83
  84 -       err = tcf_block_get(&cl->block, &cl->filter_list, sch);
  85 +       err = tcf_block_get(&cl->block, &cl->filter_list, sch, extack);
  86         if (err) {
  87                 kfree(cl);
  88                 return err;
  89 @@ -1699,7 +1703,8 @@ static struct Qdisc *ceetm_cls_leaf(stru
  90  }
  91
  92  static int ceetm_cls_graft(struct Qdisc *sch, unsigned long arg,
  93 -                          struct Qdisc *new, struct Qdisc **old)
  94 +                          struct Qdisc *new, struct Qdisc **old,
  95 +                          struct netlink_ext_ack *extack)
  96  {
  97         if (new && strcmp(new->ops->id, ceetm_qdisc_ops.id)) {
  98                 pr_err("CEETM: only ceetm qdiscs can be attached to ceetm classes\n");
  99 @@ -1763,7 +1768,8 @@ static int ceetm_cls_dump_stats(struct Q
 100         return gnet_stats_copy_app(d, &xstats, sizeof(xstats));
 101  }
 102
 103 -static struct tcf_block *ceetm_tcf_block(struct Qdisc *sch, unsigned long arg)
 104 +static struct tcf_block *ceetm_tcf_block(struct Qdisc *sch, unsigned long arg,
 105 +                                        struct netlink_ext_ack *extack)
 106  {
 107         struct ceetm_qdisc *priv = qdisc_priv(sch);
 108         struct ceetm_class *cl = (struct ceetm_class *)arg;