iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: mvneta: Use struct tc_mqprio_qopt_offload for MQPrio configuration

Browse Source 
The struct tc_mqprio_qopt_offload is a container for struct tc_mqprio_qopt,
that allows passing extra parameters, such as traffic shaping. This commit
converts the current mqprio code to that new struct.

Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Maxime Chevallier 2021-11-26 12:20:53 +01:00 committed by David S. Miller
parent 2f7ed29f2c
commit 75fa71e3ac
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/marvell/mvneta.c
View File

@ -38,6 +38,7 @@
#include <net/ipv6.h>
#include <net/tso.h>
#include <net/page_pool.h>
#include <net/pkt_cls.h>
#include <linux/bpf_trace.h>
/* Registers */
@ -4908,14 +4909,14 @@ static void mvneta_setup_rx_prio_map(struct mvneta_port *pp)
}
static int mvneta_setup_mqprio(struct net_device *dev,
struct tc_mqprio_qopt *qopt)
struct tc_mqprio_qopt_offload *mqprio)
{
struct mvneta_port *pp = netdev_priv(dev);
u8 num_tc;
int i;
qopt->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
num_tc = qopt->num_tc;
mqprio->qopt.hw = TC_MQPRIO_HW_OFFLOAD_TCS;
num_tc = mqprio->qopt.num_tc;
if (num_tc > rxq_number)
return -EINVAL;
@ -4926,13 +4927,15 @@ static int mvneta_setup_mqprio(struct net_device *dev,
return 0;
}
memcpy(pp->prio_tc_map, qopt->prio_tc_map, sizeof(pp->prio_tc_map));
memcpy(pp->prio_tc_map, mqprio->qopt.prio_tc_map,
sizeof(pp->prio_tc_map));
mvneta_setup_rx_prio_map(pp);
netdev_set_num_tc(dev, qopt->num_tc);
for (i = 0; i < qopt->num_tc; i++)
netdev_set_tc_queue(dev, i, qopt->count[i], qopt->offset[i]);
netdev_set_num_tc(dev, mqprio->qopt.num_tc);
for (i = 0; i < mqprio->qopt.num_tc; i++)
netdev_set_tc_queue(dev, i, mqprio->qopt.count[i],
mqprio->qopt.offset[i]);
return 0;
}