Commit c4d453d2 authored by Doug Berger's avatar Doug Berger Committed by David S. Miller

net: bcmgenet: correct return value of __bcmgenet_tx_reclaim

The reclaim function should return the number of buffer descriptors
reclaimed, not just the number corresponding to skb packets.

Also, remove the unnecessary computation when updating the consumer
index.

While this is not a functional problem it could degrade performance
of napi in a fragmented transmit stream.
Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5810ca3
...@@ -1218,7 +1218,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev, ...@@ -1218,7 +1218,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
} }
ring->free_bds += txbds_processed; ring->free_bds += txbds_processed;
ring->c_index = (ring->c_index + txbds_processed) & DMA_C_INDEX_MASK; ring->c_index = c_index;
dev->stats.tx_packets += pkts_compl; dev->stats.tx_packets += pkts_compl;
dev->stats.tx_bytes += bytes_compl; dev->stats.tx_bytes += bytes_compl;
...@@ -1231,7 +1231,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev, ...@@ -1231,7 +1231,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
netif_tx_wake_queue(txq); netif_tx_wake_queue(txq);
} }
return pkts_compl; return txbds_processed;
} }
static unsigned int bcmgenet_tx_reclaim(struct net_device *dev, static unsigned int bcmgenet_tx_reclaim(struct net_device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment