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

Commit c6ddfb9a authored by Madalin Bucur's avatar Madalin Bucur Committed by David S. Miller
Browse files

dpaa_eth: NETIF_F_LLTX requires to do our own update of trans_start 



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>
parent 28c1382f

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

+6 −0
Original line number Diff line number Diff line
@@ -2051,6 +2051,7 @@ 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;
@@ -2100,6 +2101,11 @@ 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;