From patchwork Mon Dec 16 17:45:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 181751 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp4614999och; Mon, 16 Dec 2019 09:51:42 -0800 (PST) X-Google-Smtp-Source: APXvYqxN73OWd8Ax2rmJDvNJN9C0C5+1inTYFuY4IWH2p7QEvYMgwd7dmVUwmI51MUrcv5Kyevr+ X-Received: by 2002:a9d:5888:: with SMTP id x8mr31613202otg.361.1576518702399; Mon, 16 Dec 2019 09:51:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576518702; cv=none; d=google.com; s=arc-20160816; b=rZl/sM+f5qHAS2D0wsq4Gxrz77nOCXWD8fDrLcDDPvka1WOZfgNLqMqDObKdhN/e3g za2Jwy3FUS8q8uT2E0hAPjX9ys/Z+H3l0XuMbUGHqeaexnTmkCZDLSTxNIkz+z5T39ME XSNXlfsuQUgYg4+DDJu17a6VnVvVAIjugALqOCy/8L7TTj89T76qxoYfEyz/7K+iH0DZ qtfe6dI8b8fXs1QrqPSpbByCuCRo0eydDrt/GV1QWVvb6wIut8ToqAQAMs7O89Q887AG EZmlWHmQ0ghhSjz9YqQVMNvIzlwOPvbyFmtE1GSVbGzpzbdAGv4IthuC6zDHu89dmuZw 3KjA== 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=6N4XO1XV4I90WJgR2Gn/ZIKlmy8A7Wmcas3ZsANryLQ=; b=UbFWEUYnVWCO7bgWxYH7a+b/jUoOSn5P4ACI0/JmYjdSklmAOVNa3ZK4R/7F6sWXo1 +gfRMzVNH2da//FIVB6NHRgp50rUAgvv27c4isp7str81BK/mo+59tmkyEyIY/Bxzgga 4pZb8cUP0F/wP4rfh7VaTj7QztZMh+dHzZMkH6GRb61Amgw6loI5M+BdPwjSbaejth7A pfZ3K+yKGjBGpShHNfoUGVsdEhe+4+izot/YZx4QWl6HjWpZ1VGrMV0XsD1oSRhgy8a2 Ol1SkC0t8c5naOefNTzcJ54W17EY6+8DgbAVAQJJeEIlDIVMOvhaqlnqigDRaoj2dGWT orNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MxHilmdw; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 w26si10732877otl.213.2019.12.16.09.51.42; Mon, 16 Dec 2019 09:51:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=MxHilmdw; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727099AbfLPRvl (ORCPT + 14 others); Mon, 16 Dec 2019 12:51:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:41986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727035AbfLPRvk (ORCPT ); Mon, 16 Dec 2019 12:51:40 -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 9A4DF20717; Mon, 16 Dec 2019 17:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576518700; bh=6xX4GUpXtBOhRworb/C4nNl8y/xDjDpnXdqXg5c/DNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MxHilmdwXOJkBpbBIK7DxTikC9K0F8klEYkk2DjnUC4kbr5dTieACJxyAxA8vjMUN /2/PScPSjko8cJP5jLmj78NUBcIoiYdut/PeW9VO6aHRrwX0J5c4h9G2a8LcxwTvQT qI8cCZjITgSHw+qEOFZQvPujxFwAeEAQXXLRbg8M= 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.14 031/267] net: ethernet: ti: cpts: correct debug for expired txq skb Date: Mon, 16 Dec 2019 18:45:57 +0100 Message-Id: <20191216174852.348367061@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174848.701533383@linuxfoundation.org> References: <20191216174848.701533383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 7d1281d812480..23c953496a0d1 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -116,9 +116,7 @@ static bool cpts_match_tx_ts(struct cpts *cpts, struct cpts_event *event) mtype, seqid); } else 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); }