From patchwork Mon Apr 25 20:51:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soheil Hassas Yeganeh X-Patchwork-Id: 614704 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qtz1261TTz9t6w for ; Tue, 26 Apr 2016 06:51:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=syLM6++e; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964979AbcDYUvq (ORCPT ); Mon, 25 Apr 2016 16:51:46 -0400 Received: from mail-qg0-f66.google.com ([209.85.192.66]:32806 "EHLO mail-qg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964853AbcDYUvo (ORCPT ); Mon, 25 Apr 2016 16:51:44 -0400 Received: by mail-qg0-f66.google.com with SMTP id 7so15873669qgj.0 for ; Mon, 25 Apr 2016 13:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N2bxYilU1h/g3y44bQW6wXaJNs/FmpqSc5dTE0VfIkU=; b=syLM6++eMxsxIzrh/suuVX8O1cm+44T72yg3S+fY0kxaGnRVWa1Iefu9bHTSeh87Ac COX2BWqlGnSHnMIf48w4cj/+nEg8vH4ZlMwhIAjvj9ZL2RqpmFiQW7RdxFMBfoLuWLMT NVn264+8dP/bYPA0Gsiox7j4cp5sb+/E7i2+FbFpKNNuBys/UYYSg5zyMBp3RgF4gy0F eGbi8kziUFg7VvZYqDDsbRbv6SsB9tcjjp+Hue3ilHMB3dC40bxekvSkAnRFPGEuPk+Y 6WKp+nMdHmDQvIFgKaS0hmdHgh87aYpqGrTZISHiUv8GVpqmngB35+QDt8ziitoeQW3F 3TkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N2bxYilU1h/g3y44bQW6wXaJNs/FmpqSc5dTE0VfIkU=; b=CqCaeU0cjDJ9XnWiyjGQFNh9YHAoMuufR4id4jnPw/d+L7AL8A8p4FkTBZHKLgAQCz ZC0ZbOI5I8BjyKS5poXmTwonNIPie4oVJ2kM6yKf+rivNbBs+Uk4Uc+uHPMLcqV+LcOr Iqt5Xbd8aT13P4Lz9zIG0AJKt/M3pKflwhd2YJxm+8KG96HbIpBxuzdNtI5hbQE2TJdT Yyaoifu9xOuzcpesqNhsYpt7wh+FDmM5RB8w9Jm7BH4ZaRhivsqqaqQ6wzPoDBbJNaFl /QUPOeCHbEjBiK7tIbv1hDBhwbFcl9SQxzeFx44sNy1kHGSnI1lg4kIRojeTgeUO8bv9 K9XQ== X-Gm-Message-State: AOPr4FWhQUmqQx3I767kW7KZ32kNWvZEhjKxid33aKuzVte6rH5T6+U50x1H7lc++L5D+g== X-Received: by 10.140.248.84 with SMTP id t81mr24180549qhc.94.1461617503826; Mon, 25 Apr 2016 13:51:43 -0700 (PDT) Received: from soheil.nyc.corp.google.com ([100.101.230.57]) by smtp.gmail.com with ESMTPSA id t193sm7773507qke.21.2016.04.25.13.51.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Apr 2016 13:51:43 -0700 (PDT) From: Soheil Hassas Yeganeh To: davem@davemloft.net, netdev@vger.kernel.org Cc: kafai@fb.com, willemb@google.com, edumazet@google.com, ycheng@google.com, ncardwell@google.com, Soheil Hassas Yeganeh Subject: [PATCH net-next 2/2] tcp: remove a redundant check for SKBTX_ACK_TSTAMP Date: Mon, 25 Apr 2016 16:51:13 -0400 Message-Id: <1461617473-11349-2-git-send-email-soheil.kdev@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1461617473-11349-1-git-send-email-soheil.kdev@gmail.com> References: <1461617473-11349-1-git-send-email-soheil.kdev@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Soheil Hassas Yeganeh txstamp_ack in tcp_skb_cb is set iff the SKBTX_ACK_TSTAMP flag is set for an skb. Thus, it is not required to check shinfo->tx_flags if the txstamp_ack bit is checked. Remove the check on shinfo->tx_flags & SKBTX_ACK_TSTAMP, since it has already been checked using the txstamp_ack bit. Signed-off-by: Soheil Hassas Yeganeh Acked-by: Martin KaFai Lau --- net/ipv4/tcp_input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 967520d..2f3fd92 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3087,8 +3087,7 @@ static void tcp_ack_tstamp(struct sock *sk, struct sk_buff *skb, return; shinfo = skb_shinfo(skb); - if ((shinfo->tx_flags & SKBTX_ACK_TSTAMP) && - !before(shinfo->tskey, prior_snd_una) && + if (!before(shinfo->tskey, prior_snd_una) && before(shinfo->tskey, tcp_sk(sk)->snd_una)) __skb_tstamp_tx(skb, NULL, sk, SCM_TSTAMP_ACK); }