From 2039a9ff462d50251fd800ce4418f76230373783 Mon Sep 17 00:00:00 2001 From: Camelia Groza Date: Mon, 22 Jul 2019 14:50:36 +0300 Subject: [PATCH] dpaa_eth: ERR010022: preserve timestamping Maintain all timestamping fields when copying the skb. Signed-off-by: Camelia Groza Signed-off-by: Yangbo Lu --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -2196,6 +2196,15 @@ static struct sk_buff *dpaa_errata_a0100 } skb_copy_header(nskb, skb); + /* Copy relevant timestamp info from the old skb to the new */ + if (priv->tx_tstamp) { + skb_shinfo(nskb)->tx_flags = skb_shinfo(skb)->tx_flags; + skb_shinfo(nskb)->hwtstamps = skb_shinfo(skb)->hwtstamps; + skb_shinfo(nskb)->tskey = skb_shinfo(skb)->tskey; + if (skb->sk) + skb_set_owner_w(nskb, skb->sk); + } + /* We move the headroom when we align it so we have to reset the * network and transport header offsets relative to the new data * pointer. The checksum offload relies on these offsets.