summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/apm
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2021-11-17 04:29:22 +0100
committerDavid S. Miller <davem@davemloft.net>2021-11-17 15:56:16 +0100
commit5337824f4dc4bb26f38fbbba4ffb425a92803f15 (patch)
tree5d00439ad091c73d88cddf5801c0850f02f32e8c /drivers/net/ethernet/apm
parentnet: use an atomic_long_t for queue->trans_timeout (diff)
downloadlinux-5337824f4dc4bb26f38fbbba4ffb425a92803f15.tar.xz
linux-5337824f4dc4bb26f38fbbba4ffb425a92803f15.zip
net: annotate accesses to queue->trans_start
In following patches, dev_watchdog() will no longer stop all queues. It will read queue->trans_start locklessly. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/apm')
-rw-r--r--drivers/net/ethernet/apm/xgene/xgene_enet_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 220dc42af31a..ff2d099aab21 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -869,7 +869,7 @@ static void xgene_enet_timeout(struct net_device *ndev, unsigned int txqueue)
for (i = 0; i < pdata->txq_cnt; i++) {
txq = netdev_get_tx_queue(ndev, i);
- txq->trans_start = jiffies;
+ txq_trans_cond_update(txq);
netif_tx_start_queue(txq);
}
}