Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aafea5d authored by Madalin Bucur's avatar Madalin Bucur Committed by Greg Kroah-Hartman
Browse files

dpaa_eth: NETIF_F_LLTX requires to do our own update of trans_start 



[ Upstream commit c6ddfb9a963f0cac0f7365acfc87f3f3b33a3b69 ]

As txq_trans_update() only updates trans_start when the lock is held,
trans_start does not get updated if NETIF_F_LLTX is declared.

Signed-off-by: default avatarMadalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8b92162f

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+6 −0
Original line number Diff line number Diff line
@@ -2052,6 +2052,7 @@ static int dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev) 
	bool nonlinear = skb_is_nonlinear(skb);

	struct rtnl_link_stats64 *percpu_stats;

	struct dpaa_percpu_priv *percpu_priv;

	struct netdev_queue *txq;

	struct dpaa_priv *priv;

	struct qm_fd fd;

	int offset = 0;
@@ -2101,6 +2102,11 @@ static int dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev) 
	if (unlikely(err < 0))

		goto skb_to_fd_failed;



	txq = netdev_get_tx_queue(net_dev, queue_mapping);



	/* LLTX requires to do our own update of trans_start */

	txq->trans_start = jiffies;



	if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) {

		fd.cmd |= cpu_to_be32(FM_FD_CMD_UPD);

		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;