cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 2039a9ff462d50251fd800ce4418f76230373783 Mon Sep 17 00:00:00 2001
|
|
From: Camelia Groza <camelia.groza@nxp.com>
|
|
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 <camelia.groza@nxp.com>
|
|
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|
---
|
|
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.
|