lkml.org 
[lkml]   [2019]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 181/209] net: macb driver, check for SKBTX_HW_TSTAMP
    Date
    From: Paul Thomas <pthomas8589@gmail.com>

    commit a62520473f15750cd1432d36b377a06cd7cff8d2 upstream.

    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>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/drivers/net/ethernet/cadence/macb_main.c
    +++ b/drivers/net/ethernet/cadence/macb_main.c
    @@ -852,7 +852,9 @@ static void macb_tx_interrupt(struct mac

    /* 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
    */

    \
     
     \ /
      Last update: 2019-12-04 19:20    [W:3.370 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site