Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F323C10F13 for ; Mon, 8 Apr 2019 13:23:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF4652147A for ; Mon, 8 Apr 2019 13:23:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jjoHAB28" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726653AbfDHNXE (ORCPT ); Mon, 8 Apr 2019 09:23:04 -0400 Received: from mail-io1-f65.google.com ([209.85.166.65]:38906 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726523AbfDHNXE (ORCPT ); Mon, 8 Apr 2019 09:23:04 -0400 Received: by mail-io1-f65.google.com with SMTP id v4so10987634ioj.5 for ; Mon, 08 Apr 2019 06:23:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=PSkW9PvxvdYAvykLTTxXYYQLiOJyrAT4Gl3p1qHfBmE=; b=jjoHAB28tY+pX1K17WcLjw6HZCds8jzDnUYEGGsFwPXE5erjsgunIbqqTVIGXe1neZ +hOsQPN/rIdVBqp9/fhXu52f0Vh0GWSp4zfTAXdtb/Oc+dK8MS/uJCyLKsEF2jP6bOYL 6arPEIvbqshjNiBk/SgzMHkjU8bEEIc2GyX/KEmFgyBoN4CwAxVimNH/A/zaQc1rlSCg C2fnB3TxrUImQ73Y3Jq/3Cp0NRV0k2tdiyqPHot3SVjFzMuUmw46gKYJxWTjiDZ4cyeV IPyM3fP9oC15gJ5A9fs7t/oD6ENKmTiFPgQgn6vJXhk2mrzzLs80LKLe5ee41Aq0jjCN izAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PSkW9PvxvdYAvykLTTxXYYQLiOJyrAT4Gl3p1qHfBmE=; b=MDhaDbD5I8ymnd1TMsaYPrlrLX/G4o30DRgnChWT4ocrxgDEyWo/l7H9bLRBF9D2qt jG6FUGvkiA5KyzDERMMMlpH6TjYnBn1biyfftu+jPElxXMZYI8CuyC9hvT6Q4UpLYGM3 IcM8VzdSTgmiYvnwjpV38A3s8Yt5a0OuQ84SXCnVFV/n89l9GkJHc4TvinsxnNKijV52 Q/7jq5Zz07IV0kBOOZFoF5773ljprwD9hoZFjS6eoF4Y4NwVqi94OI38EVlPiIKa6GXN Ro4mOecshnpCvH+5mpH2DZy5PklimrCGx2RFCt8zGynalkTf6JUzPQLdVKQ2klvuJo7N zBWw== X-Gm-Message-State: APjAAAVzw/LQLivmqbLlZbz1MAOWbt94Jf225IiIx0tr81JZWYvP/vOe BNRbdYUIrgOuRLLETxt8aBLzEQXF X-Google-Smtp-Source: APXvYqz3PpmNf2W4fuIrr2O6vIqcQuInPxXaf2fdD/Jgzd68XcI/bGnzhsfNHv8nOaGv2iNjxky01A== X-Received: by 2002:a6b:410e:: with SMTP id n14mr9321486ioa.141.1554729783222; Mon, 08 Apr 2019 06:23:03 -0700 (PDT) Received: from pthomas-desktop.amsc.com ([50.239.78.34]) by smtp.gmail.com with ESMTPSA id u19sm12412380iol.16.2019.04.08.06.23.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 06:23:02 -0700 (PDT) From: Paul Thomas To: netdev@vger.kernel.org Cc: Paul Thomas Subject: [PATCH v3] net: macb driver, check for SKBTX_HW_TSTAMP Date: Mon, 8 Apr 2019 09:20:47 -0400 Message-Id: <20190408132047.6430-1-pthomas8589@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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