From patchwork Wed Dec 11 15:03:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 181281 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp713911ile; Wed, 11 Dec 2019 07:54:37 -0800 (PST) X-Google-Smtp-Source: APXvYqxw09AfusBjkdGIz+NuN9wdnAEjE0uOjTnI5Y7pZYBN/mvJKI3Aj+4Z9jvN4O6zl2CzyFK4 X-Received: by 2002:aca:180a:: with SMTP id h10mr3434553oih.99.1576079676992; Wed, 11 Dec 2019 07:54:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576079676; cv=none; d=google.com; s=arc-20160816; b=Ri1+4A+suhv+HKCszfNitfGOZinCGtkwdcL8dMS4V+aWJElIykaCASrut7+Zl1vi6Z i5vEFxR03yfCoqTOsypHdPkEhQWDtbX/vCEynrPOQ0Nmb6HYV+wRO+269FZYap6GB6Um 1v74o1IaMKoipNZCGmdjoQxSY1YIbdXLVlQ0Jnk91fGqrHkApLg0WCtGwNWuXtd1TUvg Uf7tw/jI/hBEojptjOFQy1OaWVOuEwAGf3AcYqZbG/AZ7qHjPkEHrNgjR0gqtktX/c9H j4lUGSttcYl/noL9lWeN4coAR3TBGHc3Mu2R58nSxZE+oZ1/dR87tNlmsVT7Ts7I8LU/ kcqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DSjx8EoBENwOEC3FzbTqZXxTSmbNu+NC/QLIdib0KCk=; b=0mz/q35ufd30eUkRbRWELvKA2eIEl2IhHbeBE7IO2xf0+1eHiM2RgcxuickdQkL3YK PLCfpGtXrPmw73L9r7a80PFp0tV8x5SiAwEHTC4D9m6+/HOVA+dHesLdUrZjB9mZkwzv 5mW9CjG6QgYpE4ntOlGKEG4deD9+zyuO1DzwXYVNyINDKWf1n6n2aaGeyy8UrVjdIppG GOB9vau7WQAEm6o4K8YU3q5F+JR7Bk/1pKcdbXtBrEVeWT4ZwzdA8+apZMwq1sIxvjA3 JRjabpvkUejLyBxBCqwryoR9MpoZ8tvhSD3J5AK1PwXAY2nVPNqR2Rcm3uxyz+y/tgN8 nhkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JUrYAt6S; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q22si1623018otm.304.2019.12.11.07.54.36; Wed, 11 Dec 2019 07:54:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JUrYAt6S; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732015AbfLKPR2 (ORCPT + 27 others); Wed, 11 Dec 2019 10:17:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:44820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731391AbfLKPRY (ORCPT ); Wed, 11 Dec 2019 10:17:24 -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 5B2DB2073D; Wed, 11 Dec 2019 15:17:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077443; bh=aeJN9iD2dFfWHJYWyfxdk8+zHVMsBoio6kyTZ0brv3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JUrYAt6Si/Ej0BPborKQZj5QXIHgI4/9xTDoRH8yWCaIA43iVPJ+plrTc1X7S51Eo FmCjASuwdz8PZu2R3xRm2/lHi2YPPP4K4Jtx+wyurQvH4tNuT/hqEwcsrDQduXpkaB YuYfc5dVkCS5Agyyoyts5Hexo1cEVMflx937sphQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ivan Khoronzhuk , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 042/243] net: ethernet: ti: cpts: correct debug for expired txq skb Date: Wed, 11 Dec 2019 16:03:24 +0100 Message-Id: <20191211150341.984159300@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ivan Khoronzhuk [ Upstream commit d0e14c4d9bcef0d4aa1057d2959adaa6f18d4a17 ] The msgtype and seqid that is smth that belongs to event for comparison but not for staled txq skb. Signed-off-by: Ivan Khoronzhuk Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ti/cpts.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 4f644ac314fe8..d7543811dfae2 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -119,9 +119,7 @@ static bool cpts_match_tx_ts(struct cpts *cpts, struct cpts_event *event) if (time_after(jiffies, skb_cb->tmo)) { /* timeout any expired skbs over 1s */ - dev_dbg(cpts->dev, - "expiring tx timestamp mtype %u seqid %04x\n", - mtype, seqid); + dev_dbg(cpts->dev, "expiring tx timestamp from txq\n"); __skb_unlink(skb, &cpts->txq); dev_consume_skb_any(skb); }