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 3CD97C432C0 for ; Tue, 3 Dec 2019 22:58:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 050A72053B for ; Tue, 3 Dec 2019 22:58:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413905; bh=JCoY7mZHq3opaU1WkN9zdL3pS8mGjJQ4hMf3eU8txPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OIXBzHhAd0AiAwg9LD68ol/dFBNlPua+yjT7FA1/13+VPFH5AVafs2HYrMkugGuI4 lk8wwQZkxDudmNyQUJ+fqYIHdp6+J3YyV0l/gfHe4CWQw5t4ShtRvr5+ZLQJprupTC PgRqO/umjWKg2j7NWHF2GBr8TvUkgmtoRXISivdA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730643AbfLCW6Y (ORCPT ); Tue, 3 Dec 2019 17:58:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:54618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727937AbfLCW6R (ORCPT ); Tue, 3 Dec 2019 17:58:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 73E3A20863; Tue, 3 Dec 2019 22:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413896; bh=JCoY7mZHq3opaU1WkN9zdL3pS8mGjJQ4hMf3eU8txPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0vpWpd45ZrqTYsYFQGK/NehKGZHzI8X20XeVqh9QpGROgR4u+zVldIozD+C4enam1 RX94ppPaUXx0jXL/llydvyoPg/9ulKqQMv45ANpSdXkUg3577QryP40tMEbZS3h7sM Z2cLdt/OvsP1hPdJ6sMbBQHedehX3FGK7mx9dEVY= 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.19 297/321] net: macb driver, check for SKBTX_HW_TSTAMP Date: Tue, 3 Dec 2019 23:36:03 +0100 Message-Id: <20191203223442.602846662@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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 @@ -860,7 +860,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 */