diff options
| author | Antoine Tenart <atenart@kernel.org> | 2022-04-12 15:58:52 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-04-14 08:04:41 +0200 |
| commit | ead2351d260613d2ec38f08e40f0496e5e281944 (patch) | |
| tree | 0be2f210f54b41b01f79241962de6a64343aded9 | |
| parent | ad8064a7f1a67c3e47b37ffcb66abb12c931daa4 (diff) | |
| download | net-master.tar.gz | |
Commit 5337824f4dc4 ("net: annotate accesses to queue->trans_start")
introduced a new helper, txq_trans_cond_update, to update
queue->trans_start using WRITE_ONCE. One snippet in drivers/net/tun.c
was missed, as it was introduced roughly at the same time.
Fixes: 5337824f4dc4 ("net: annotate accesses to queue->trans_start")
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Antoine Tenart <atenart@kernel.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20220412135852.466386-1-atenart@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 276a0e42ca8eaa..dbe4c0a4be2cd6 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1124,7 +1124,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) /* NETIF_F_LLTX requires to do our own update of trans_start */ queue = netdev_get_tx_queue(dev, txq); - queue->trans_start = jiffies; + txq_trans_cond_update(queue); /* Notify and wake up reader process */ if (tfile->flags & TUN_FASYNC) |