summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorStefan Wahren <wahrenst@gmx.net>2024-11-08 12:43:43 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-11-22 15:38:31 +0100
commitfa8d2d1410046513aa91ef561a007cdb315ede9b (patch)
tree9da522eca51615fb26745aced82e1ab91c3d80d3 /drivers/net
parentad975697211f4f2c4ce61c3ba524fd14d88ceab8 (diff)
downloadlinux-fa8d2d1410046513aa91ef561a007cdb315ede9b.tar.gz
linux-fa8d2d1410046513aa91ef561a007cdb315ede9b.tar.bz2
linux-fa8d2d1410046513aa91ef561a007cdb315ede9b.zip
net: vertexcom: mse102x: Fix tx_bytes calculation
[ Upstream commit e68da664d379f352d41d7955712c44e0a738e4ab ] The tx_bytes should consider the actual size of the Ethernet frames without the SPI encapsulation. But we still need to take care of Ethernet padding. Fixes: 2f207cbf0dd4 ("net: vertexcom: Add MSE102x SPI support") Signed-off-by: Stefan Wahren <wahrenst@gmx.net> Link: https://patch.msgid.link/20241108114343.6174-3-wahrenst@gmx.net Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/vertexcom/mse102x.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c
index dd766e175f7d..8f67c39f479e 100644
--- a/drivers/net/ethernet/vertexcom/mse102x.c
+++ b/drivers/net/ethernet/vertexcom/mse102x.c
@@ -437,13 +437,15 @@ static void mse102x_tx_work(struct work_struct *work)
mse = &mses->mse102x;
while ((txb = skb_dequeue(&mse->txq))) {
+ unsigned int len = max_t(unsigned int, txb->len, ETH_ZLEN);
+
mutex_lock(&mses->lock);
ret = mse102x_tx_pkt_spi(mse, txb, work_timeout);
mutex_unlock(&mses->lock);
if (ret) {
mse->ndev->stats.tx_dropped++;
} else {
- mse->ndev->stats.tx_bytes += txb->len;
+ mse->ndev->stats.tx_bytes += len;
mse->ndev->stats.tx_packets++;
}