From mboxrd@z Thu Jan 1 00:00:00 1970 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 CB0D9C10F13 for ; Mon, 8 Apr 2019 19:38:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CCC320880 for ; Mon, 8 Apr 2019 19:38:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ix3wQZwG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727580AbfDHTiQ (ORCPT ); Mon, 8 Apr 2019 15:38:16 -0400 Received: from mail-it1-f196.google.com ([209.85.166.196]:54044 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726558AbfDHTiP (ORCPT ); Mon, 8 Apr 2019 15:38:15 -0400 Received: by mail-it1-f196.google.com with SMTP id y204so1075172itf.3 for ; Mon, 08 Apr 2019 12:38:15 -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=51lOfuY5ysqg0cXhC64mhUDlmTVS5h8u4kZMZFNYKrk=; b=ix3wQZwG2swXReAvFEYcREbYhE1D/9ZIb3S4lQclsFB18jRO3x5IdvRaPnPUKkEt2n XPlfWsPnncJdOOquN+adwiOIMlUMJOFC6/EshSYe6/+zdDaeh0in54+JmQKuVK48udAv AS4b3a0QWKN0uwCVc69JmF8T79XXhKAHV19Dz/TrMSbZilR7eVr4E9TOun4qxNbNhDWx RElsgo4N911/FxZEPY4nLEBMmg60C/6l01nKEOnK9pmbJ9PBwdVBnOVVZjLfVDGMHK9V +kLLbLNNBCVw0FK9AFpVUOO4hSh4Yj7pJcarSmUur1uWGJyrnjuuZ7jJGC2uAmud+tZU 7b2g== 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=51lOfuY5ysqg0cXhC64mhUDlmTVS5h8u4kZMZFNYKrk=; b=gf1UQSEntP/kkHFtBI6sxD1ieX7EEw6m8tSDrU7J9RiBvsUGXNcbJWKxLsSiZW0Nqj gexQOO9+lPj5d33XKFZ4D4+rHQ5lla4UehQcFT4NkPB88vpFxWUSQQzg2VcnA/UgO/PH fwpmYMd19NAKlfWwKFYHmUJBjk6w7wjNx0AehX0TgEl3SiVogYwg3ArGKMZciEltxeeH M8vBziddIYZy8EtvpOU7QJu97ozhuEtI4RVDJshR+JEH7kIoyyvbMnGnbqAazI+ZZdtT 2hrZZcR2dKY1zGH3I161J20VcF+oU3hRR+oIpQ0thVRPp+/9x0UL2CJ6QSn88Rvj6GMc q43g== X-Gm-Message-State: APjAAAU0kCH8dtbS0ipuk4tOQbt7D0CSQUFN5e/id/KdjBKWIVBlalp9 R5w6Lygw4zmXsI9iaGylo8PmD0OE X-Google-Smtp-Source: APXvYqxBM2UUy7JPQ2Tolz+EbESyr5+4eYHT2pxd5U/rTrTjGO6ViU5gyiM1shKLlGsb43G2TDmTQw== X-Received: by 2002:a24:a85:: with SMTP id 127mr21187376itw.40.1554752294523; Mon, 08 Apr 2019 12:38:14 -0700 (PDT) Received: from pthomas-desktop.amsc.com ([50.239.78.34]) by smtp.gmail.com with ESMTPSA id t78sm4500406itb.39.2019.04.08.12.38.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 12:38:13 -0700 (PDT) From: Paul Thomas To: netdev@vger.kernel.org Cc: Paul Thomas Subject: [PATCH v4] net: macb driver, check for SKBTX_HW_TSTAMP Date: Mon, 8 Apr 2019 15:37:54 -0400 Message-Id: <20190408193754.18707-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 --- From v3 fix the alignment and fix the length to < 80 char drivers/net/ethernet/cadence/macb_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index ad099fd01b45..763220870d07 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -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 */ -- 2.17.1