From patchwork Thu Apr 28 03:39:00 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: 615980 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 3qwMyN0Z29z9t79 for ; Thu, 28 Apr 2016 13:39:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=dcqGJiRT; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752316AbcD1DjJ (ORCPT ); Wed, 27 Apr 2016 23:39:09 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:35629 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751710AbcD1DjH (ORCPT ); Wed, 27 Apr 2016 23:39:07 -0400 Received: by mail-qk0-f196.google.com with SMTP id b63so4781331qkg.2 for ; Wed, 27 Apr 2016 20:39:07 -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=x9EpGz+/am+StvEYD13ZyTd0cwwq6mIoQRk80+eCCDM=; b=dcqGJiRTouUNzaaR9/p36XzPra8blB4aMqQVE4pbvnskk70c0EYnNwAIhjV+XEBC5C h/eoCMOTc/WQGgREl1tL13qeTYcjv2tBw/h8CdtayoWXDwP8JA56V5GImCduFUkl9D/v 48TusfLF4wC3rYYobIov9eEDY+UhnEvXTTznSrOofRi+320KfVXUsXFfQNcs54/0RHVQ UrVvVBKMiNSWbwY/k3vEOoy/QpUPczY44Q/v0TNkjctIHuGWNb6oDCH0XBRM1sIkMwPz RpGgMf9n0z12QylBL+Q5BHfpgTSONJLLiHZwQn0d8w4udFMkjWD7A/IFUd8kvb0y2ycj 6xNg== 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=x9EpGz+/am+StvEYD13ZyTd0cwwq6mIoQRk80+eCCDM=; b=c8ueyp0b4+IP21w1+LlMfFwnxa+ZpKPKQUG3AK3j+Yfl5bBFiPLuiqSZoJKzgIpx3i n6ghV0eKTEjvnJ1o2GEl2Oy2ZfnSz44FepGzETCcrTOLuNciZSj7dl1U4SytQVRLKXEi FMpPIMzXCZqbnygGqFrz7w9gzWK8eXt3ucLBp6xJOX2c3zlBOddkFHYwIxh5v0QnCb2y T0MMLagqUGWpvB0XQobGXptkc3TEnh3Wpn8Gk3Kv1nfCtvTMlWN1HETvqxtwoCCHRLG/ vTju2e8y5udcXb6GNMhGgIl/MP8qrnObeY2elhh5DTIro7Jr3rQotJHLP5RJ0tM9Cort rFdA== X-Gm-Message-State: AOPr4FWR/lLmFcXELjycJKQniVEfVzIBJBot1/geBEpVPOIixusH8NpxKu+MqqbONj1U7A== X-Received: by 10.55.130.66 with SMTP id e63mr12587873qkd.128.1461814746533; Wed, 27 Apr 2016 20:39:06 -0700 (PDT) Received: from soheil.nyc.corp.google.com ([100.101.230.57]) by smtp.gmail.com with ESMTPSA id c129sm2240920qha.38.2016.04.27.20.39.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Apr 2016 20:39:05 -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 v2 net-next 1/2] tcp: remove an unnecessary check in tcp_tx_timestamp Date: Wed, 27 Apr 2016 23:39:00 -0400 Message-Id: <1461814741-848-2-git-send-email-soheil.kdev@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1461814741-848-1-git-send-email-soheil.kdev@gmail.com> References: <1461814741-848-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 Remove the redundant check for sk->sk_tsflags in tcp_tx_timestamp. tcp_tx_timestamp() receives the tsflags as a parameter. As a result the "sk->sk_tsflags || tsflags" is redundant, since tsflags already includes sk->sk_tsflags plus overrides from control messages. Signed-off-by: Soheil Hassas Yeganeh Acked-by: Eric Dumazet --- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 4d73858..3c542dc 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -430,7 +430,7 @@ EXPORT_SYMBOL(tcp_init_sock); static void tcp_tx_timestamp(struct sock *sk, u16 tsflags, struct sk_buff *skb) { - if (sk->sk_tsflags || tsflags) { + if (tsflags) { struct skb_shared_info *shinfo = skb_shinfo(skb); struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);