net: macb driver, check for SKBTX_HW_TSTAMP
Subsystems (3)
PATCH v3 1/1 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.
---
Fix subject and patch formatting from v2
drivers/net/ethernet/cadence/macb_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/cadence/macb_main.c +2 -1
@@ -898,7 +898,8 @@ 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 */
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Paul Thomas <[email protected]>
Date: Mon, 8 Apr 2019 09:20:47 -0400
drivers/net/ethernet/cadence/macb_main.c static void macb_tx_interrupt(struct macb_queue *queue) · line 902
Quoted 2 lines
drivers/net/ethernet/cadence/macb_main.c +2
-0+if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP ) && +gem_ptp_do_txstamp (queue, skb, desc) ==0 ) {
The second line should start precisely at the first column after the openning parenthesis of the first line.
You must use the appropriate number of TAB then SPACE characters necessary to achieve this.
Quoted 4 lines · David Miller
From: Paul Thomas <[email protected]>
Date: Mon, 8 Apr 2019 09:20:47 -0400
Quoted 8 lines
drivers/net/ethernet/cadence/macb_main.c static void macb_tx_interrupt(struct macb_queue *queue) · line 902
Quoted 2 lines
drivers/net/ethernet/cadence/macb_main.c +2
-0+if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP ) && +gem_ptp_do_txstamp (queue, skb, desc) ==0 ) {The second line should start precisely at the first column after the openning parenthesis of the first line.
You must use the appropriate number of TAB then SPACE characters necessary to achieve this.
Thanks David