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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 B5C40C43603 for ; Wed, 4 Dec 2019 18:08:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A2252154A for ; Wed, 4 Dec 2019 18:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482920; bh=gqjFT9aKmKHprUvbapiJKhGv5mDYLdxXn0tiKyUo1bI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=It9iffyxH7klN8RT7lB51FqDjEjYSWAf+mYN85HUPmE6mXp4g0LqaLso2h/hPayKL kZs1lBORvwkq1Pz7fj2BtOIgTmlxWNalUM5nsBtWFDnPqIhi5sZYRFQiwrDyxxyG1R A2jsWzFz8nPOj6ZQXMAcILC5q8mBSznWHvskkZaE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730939AbfLDSIj (ORCPT ); Wed, 4 Dec 2019 13:08:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:60430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730911AbfLDSI2 (ORCPT ); Wed, 4 Dec 2019 13:08:28 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B23F12084B; Wed, 4 Dec 2019 18:08:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482908; bh=gqjFT9aKmKHprUvbapiJKhGv5mDYLdxXn0tiKyUo1bI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UfBsEHy67ryGg70bLCCNN7347RZteGAsJmtgDEDVoy/KTg+1jUbcwrBhB5KgxtMHQ DqqHLyP1XAouSoOPp/ai+LvrUj9p5pNVfDBLWLghpceT6LTn1lG3dwjBgYnXqi4qBN GK1u5LXHJIYACbYP6A36+Bbh0k7kwZ6jIvhbqAro= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Thomas , "David S. Miller" , Lee Jones Subject: [PATCH 4.14 181/209] net: macb driver, check for SKBTX_HW_TSTAMP Date: Wed, 4 Dec 2019 18:56:33 +0100 Message-Id: <20191204175335.949831743@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paul Thomas 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 Signed-off-by: David S. Miller Signed-off-by: Lee Jones Signed-off-by: Greg Kroah-Hartman --- 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 */