Commit a6252047 authored Apr 08, 2019 by Paul Thomas Committed by David S. Miller Apr 08, 2019

net: macb driver, check for SKBTX_HW_TSTAMP



Make sure SKBTX_HW_TSTAMP (i.e. SOF_TIMESTAMPING_TX_HARDWARE) has been
enabled for this skb. It does fix the issue where normal socks that
aren't expecting a timestamp will not wake up on select, but when a
user does want a SOF_TIMESTAMPING_TX_HARDWARE it does work.

Signed-off-by: Paul Thomas <pthomas8589@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 738de00c

drivers/net/ethernet/cadence/macb_main.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -898,7 +898,9 @@ static void macb_tx_interrupt(struct macb_queue *queue)

		/* First, update TX stats if needed */
		if (skb) {
		if (gem_ptp_do_txstamp(queue, skb, desc) == 0) {
		if (unlikely(skb_shinfo(skb)->tx_flags &
		SKBTX_HW_TSTAMP) &&
		gem_ptp_do_txstamp(queue, skb, desc) == 0) {
		/* skb now belongs to timestamp buffer
		* and will be removed later
		*/