[PATCH v3] net: macb driver, check for SKBTX_HW_TSTAMP

[PATCH v3] net: macb driver, check for SKBTX_HW_TSTAMP

[Paul Thomas]

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>
---
 Fix subject and patch formatting from v2

 drivers/net/ethernet/cadence/macb_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index ad099fd01b45..48fc45ab514f 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -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
 					 */
-- 
2.17.1

Re: [PATCH v3] net: macb driver, check for SKBTX_HW_TSTAMP

[David Miller]

From: Paul Thomas <pthomas8589@gmail.com>
Date: Mon,  8 Apr 2019 09:20:47 -0400

> +				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.

Re: [PATCH v3] net: macb driver, check for SKBTX_HW_TSTAMP

[Paul Thomas]

On Mon, Apr 8, 2019 at 1:04 PM David Miller <davem@davemloft.net> wrote:
>
> From: Paul Thomas <pthomas8589@gmail.com>
> Date: Mon,  8 Apr 2019 09:20:47 -0400
>
> > +                             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