target/linux/mvebu/patches-5.10/702-net-next-ethernet-marvell-mvnetaMQPrioOffload.patch

   1 From 75fa71e3acadbb4ab5eda18505277eb9a1f69b23 Mon Sep 17 00:00:00 2001
   2 From: Maxime Chevallier <maxime.chevallier@bootlin.com>
   3 Date: Fri, 26 Nov 2021 12:20:53 +0100
   4 Subject: net: mvneta: Use struct tc_mqprio_qopt_offload for MQPrio
   5  configuration
   6
   7 The struct tc_mqprio_qopt_offload is a container for struct tc_mqprio_qopt,
   8 that allows passing extra parameters, such as traffic shaping. This commit
   9 converts the current mqprio code to that new struct.
  10
  11 Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
  12 Signed-off-by: David S. Miller <davem@davemloft.net>
  13 ---
  14  drivers/net/ethernet/marvell/mvneta.c | 17 ++++++++++-------
  15  1 file changed, 10 insertions(+), 7 deletions(-)
  16
  17 (limited to 'drivers/net/ethernet/marvell/mvneta.c')
  18
  19 diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
  20 index 80e4b500695e6..46b7604805f76 100644
  21 --- a/drivers/net/ethernet/marvell/mvneta.c
  22 +++ b/drivers/net/ethernet/marvell/mvneta.c
  23 @@ -38,6 +38,7 @@
  24  #include <net/ipv6.h>
  25  #include <net/tso.h>
  26  #include <net/page_pool.h>
  27 +#include <net/pkt_cls.h>
  28  #include <linux/bpf_trace.h>
  29
  30  /* Registers */
  31 @@ -4908,14 +4909,14 @@ static void mvneta_setup_rx_prio_map(struct mvneta_port *pp)
  32  }
  33
  34  static int mvneta_setup_mqprio(struct net_device *dev,
  35 -                              struct tc_mqprio_qopt *qopt)
  36 +                              struct tc_mqprio_qopt_offload *mqprio)
  37  {
  38         struct mvneta_port *pp = netdev_priv(dev);
  39         u8 num_tc;
  40         int i;
  41
  42 -       qopt->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
  43 -       num_tc = qopt->num_tc;
  44 +       mqprio->qopt.hw = TC_MQPRIO_HW_OFFLOAD_TCS;
  45 +       num_tc = mqprio->qopt.num_tc;
  46
  47         if (num_tc > rxq_number)
  48                 return -EINVAL;
  49 @@ -4926,13 +4927,15 @@ static int mvneta_setup_mqprio(struct net_device *dev,
  50                 return 0;
  51         }
  52
  53 -       memcpy(pp->prio_tc_map, qopt->prio_tc_map, sizeof(pp->prio_tc_map));
  54 +       memcpy(pp->prio_tc_map, mqprio->qopt.prio_tc_map,
  55 +              sizeof(pp->prio_tc_map));
  56
  57         mvneta_setup_rx_prio_map(pp);
  58
  59 -       netdev_set_num_tc(dev, qopt->num_tc);
  60 -       for (i = 0; i < qopt->num_tc; i++)
  61 -               netdev_set_tc_queue(dev, i, qopt->count[i], qopt->offset[i]);
  62 +       netdev_set_num_tc(dev, mqprio->qopt.num_tc);
  63 +       for (i = 0; i < mqprio->qopt.num_tc; i++)
  64 +               netdev_set_tc_queue(dev, i, mqprio->qopt.count[i],
  65 +                                   mqprio->qopt.offset[i]);
  66
  67         return 0;
  68  }
  69 --
  70 cgit 1.2.3-1.el7
  71