android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()"

Browse Source 
This reverts commit d1e4e94cb8 which is
commit b8ec0dc3845f6c9089573cb5c2c4b05f7fc10728 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I08cf60f05f5db95e255ce111e9556b0671b0cc09
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-08-11 14:28:51 +00:00
parent 8c417688f0
commit 306e16d49c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/mac802154/tx.c
View File

@ -34,8 +34,8 @@ void ieee802154_xmit_worker(struct work_struct *work)
if (res)
goto err_tx;
DEV_STATS_INC(dev, tx_packets);
DEV_STATS_ADD(dev, tx_bytes, skb->len);
dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len;
ieee802154_xmit_complete(&local->hw, skb, false);
@ -86,8 +86,8 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
goto err_tx;
}
DEV_STATS_INC(dev, tx_packets);
DEV_STATS_ADD(dev, tx_bytes, len);
dev->stats.tx_packets++;
dev->stats.tx_bytes += len;
} else {
local->tx_skb = skb;
queue_work(local->workqueue, &local->tx_work);