Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp689915ybg; Mon, 1 Jun 2020 11:45:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYkxhFK2bVlv68POwWDX0IuxM/5khKBFXZ/bZ/SE/dCriq5L8IFccwWKv7f3e0ZZUIYq8z X-Received: by 2002:a17:906:17c5:: with SMTP id u5mr19833078eje.275.1591037157296; Mon, 01 Jun 2020 11:45:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591037157; cv=none; d=google.com; s=arc-20160816; b=MZIQAxvhiVToHC+wvGZ+C+ExQbP2vUCaSBuHxMn9gIopvGzhXJvtEjKPuVV566cM3E ntWZC1Gwq1I2pHF4QQoDWNWbc6RaTJJQsQ/GY4tN6VZn2pcMLKF1KMco73YbjcFWHrWc IUu8HQhqsTp2HFDp0fXbbhTPps0RMX5liy9j1eDKiqXRObiChcJa3vfKU2X986tlKF75 JSVz/F5cnnKYKO8IANgJhuz4Z2Icg85AysG33AeLqgYCE7gfX1YbAHg9M2UUY2fovhFD kBTb0cVTc7Cp2vJtJEV9XR5Jft+Jc9CG8EA94Fp6GyepaIZMXAKvjWyHk9H6k8D0ZJRy V97A== 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=oE3zoby1lxNeZV5t+E/yEwZuMoIQTXlAWErGYafLRdA=; b=SH36kdMTqS3t3W/lNewn/yBClUGURqBsYs4DprhcgdecFLM7JrxZyuCRO2dnuGEYyB ii7zddnX9/PkUK+FyAVtlQ99ET2F8vf3xi4YQVstxIAKx7hBWjhjSwT+J0le+KztL0oR wMUxUOD//wyCuR/jQNhVELYk8UjmNm7jVRd7urEYKy6DiJE46NoJrCB/39rjNuEwC5CU TQFDGajxSiUDu9QbGgBhW5A5cLYYQP5K9C/2EkH74BY7q7lyZ1HOe4EyhZg++K4noYGG DZci68gIvZ9YRrGU45VOUabPOqms+e9X3M0AHUOYvhHpy2MlFm2sjAkHX8w7YNJN5ION 1vsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XjLwQXFH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l13si201691ejx.63.2020.06.01.11.45.33; Mon, 01 Jun 2020 11:45:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XjLwQXFH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729225AbgFASLK (ORCPT + 99 others); Mon, 1 Jun 2020 14:11:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:57910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730308AbgFASKx (ORCPT ); Mon, 1 Jun 2020 14:10:53 -0400 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 E40F4206E2; Mon, 1 Jun 2020 18:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035053; bh=S2SI/ZGiBbnJng5OesmlFF79jiK584W1YvWabB6Yq4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XjLwQXFHG9yPLCjdO+p57UYueBtoX1XHuuXCI1fczi6mmjetS68r1Lk4cPDQXs9up sjnRaeumZ1OYzv9U5lqorBhU2mJDSEP6mMtriECUIhfxobMVEXGB2MNs2GM0qe4epx ufn6Wbmymq8kHNTCC52CVnt4orzSkyBGLVNcht5g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Ayush Sawal , Vinay Kumar Yadav , "David S. Miller" Subject: [PATCH 5.4 131/142] crypto: chelsio/chtls: properly set tp->lsndtime Date: Mon, 1 Jun 2020 19:54:49 +0200 Message-Id: <20200601174051.334241879@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174037.904070960@linuxfoundation.org> References: <20200601174037.904070960@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: Eric Dumazet commit a4976a3ef844c510ae9120290b23e9f3f47d6bce upstream. TCP tp->lsndtime unit/base is tcp_jiffies32, not tcp_time_stamp() Fixes: 36bedb3f2e5b ("crypto: chtls - Inline TLS record Tx") Signed-off-by: Eric Dumazet Cc: Ayush Sawal Cc: Vinay Kumar Yadav Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/crypto/chelsio/chtls/chtls_io.c +++ b/drivers/crypto/chelsio/chtls/chtls_io.c @@ -682,7 +682,7 @@ int chtls_push_frames(struct chtls_sock make_tx_data_wr(sk, skb, immdlen, len, credits_needed, completion); tp->snd_nxt += len; - tp->lsndtime = tcp_time_stamp(tp); + tp->lsndtime = tcp_jiffies32; if (completion) ULP_SKB_CB(skb)->flags &= ~ULPCB_FLAG_NEED_HDR; } else {