hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/net/ethernet/freescale/enetc/enetc.c
....@@ -5,6 +5,7 @@
55 #include <linux/tcp.h>
66 #include <linux/udp.h>
77 #include <linux/vmalloc.h>
8
+#include <net/pkt_sched.h>
89
910 /* ENETC overhead: optional extension BD + 1 BD gap */
1011 #define ENETC_TXBDS_NEEDED(val) ((val) + 2)
....@@ -384,12 +385,7 @@
384385 if (skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS) {
385386 memset(&shhwtstamps, 0, sizeof(shhwtstamps));
386387 shhwtstamps.hwtstamp = ns_to_ktime(tstamp);
387
- /* Ensure skb_mstamp_ns, which might have been populated with
388
- * the txtime, is not mistaken for a software timestamp,
389
- * because this will prevent the dispatch of our hardware
390
- * timestamp to the socket.
391
- */
392
- skb->tstamp = ktime_set(0, 0);
388
+ skb_txtime_consumed(skb);
393389 skb_tstamp_tx(skb, &shhwtstamps);
394390 }
395391 }