net: mvpp2: use the aggr txq size define everywhere
Cosmetic patch using the MVPP2_AGGR_TXQ_SIZE everywhere instead of the size field of aggr_txq, as the size never change and is always equal to the MVPP2_AGGR_TXQ_SIZE define. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net>hifive-unleashed-5.1
parent
1d17db08c0
commit
02856a3ba6
|
@ -5055,7 +5055,7 @@ static void mvpp2_aggr_txq_pend_desc_add(struct mvpp2_port *port, int pending)
|
||||||
static int mvpp2_aggr_desc_num_check(struct mvpp2 *priv,
|
static int mvpp2_aggr_desc_num_check(struct mvpp2 *priv,
|
||||||
struct mvpp2_tx_queue *aggr_txq, int num)
|
struct mvpp2_tx_queue *aggr_txq, int num)
|
||||||
{
|
{
|
||||||
if ((aggr_txq->count + num) > aggr_txq->size) {
|
if ((aggr_txq->count + num) > MVPP2_AGGR_TXQ_SIZE) {
|
||||||
/* Update number of occupied aggregated Tx descriptors */
|
/* Update number of occupied aggregated Tx descriptors */
|
||||||
int cpu = smp_processor_id();
|
int cpu = smp_processor_id();
|
||||||
u32 val = mvpp2_read(priv, MVPP2_AGGR_TXQ_STATUS_REG(cpu));
|
u32 val = mvpp2_read(priv, MVPP2_AGGR_TXQ_STATUS_REG(cpu));
|
||||||
|
@ -5063,7 +5063,7 @@ static int mvpp2_aggr_desc_num_check(struct mvpp2 *priv,
|
||||||
aggr_txq->count = val & MVPP2_AGGR_TXQ_PENDING_MASK;
|
aggr_txq->count = val & MVPP2_AGGR_TXQ_PENDING_MASK;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((aggr_txq->count + num) > aggr_txq->size)
|
if ((aggr_txq->count + num) > MVPP2_AGGR_TXQ_SIZE)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -5447,7 +5447,7 @@ static int mvpp2_aggr_txq_init(struct platform_device *pdev,
|
||||||
if (!aggr_txq->descs)
|
if (!aggr_txq->descs)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
aggr_txq->last_desc = aggr_txq->size - 1;
|
aggr_txq->last_desc = MVPP2_AGGR_TXQ_SIZE - 1;
|
||||||
|
|
||||||
/* Aggr TXQ no reset WA */
|
/* Aggr TXQ no reset WA */
|
||||||
aggr_txq->next_desc_to_proc = mvpp2_read(priv,
|
aggr_txq->next_desc_to_proc = mvpp2_read(priv,
|
||||||
|
|
Loading…
Reference in New Issue