From patchwork Mon Apr 25 20:51:12 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: 614703 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 3qtz0m6nNxz9t6w for ; Tue, 26 Apr 2016 06:51:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=zuTHe+uY; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964927AbcDYUvf (ORCPT ); Mon, 25 Apr 2016 16:51:35 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:32834 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964853AbcDYUvd (ORCPT ); Mon, 25 Apr 2016 16:51:33 -0400 Received: by mail-qk0-f196.google.com with SMTP id q184so11384590qkf.0 for ; Mon, 25 Apr 2016 13:51:33 -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; bh=KNMD4bkMUVMkqysJ6AyH6R9qkm7h+g1koAiFnaEo2LM=; b=zuTHe+uYGju5sqkKbRE/UaD9ka3B1Tv9fZTV5VKCJVYuk2pPwelDG6R4eUZrrCy9qx xlFLcPWWGqQt3Y35UpkhWYsoz1x+5EDyZo/JWqYghrO3/w6uMOakVjn61ZfL2TPgWmp8 JwREm+I6RgUoJJFYDEbHoqcFX5+YMzPTg1WhiI+xwYSw4vwzqOYqIri5kdi0lWIOB+wl 8OpljhtsYBxe7jYOxrBG+HoRAafMaxJjsxeVPyK5LbsP5yq1uS+40MApvEfmdgjVu1Dw x80h9vPMkzyhYspDCnW3HEdHM5Aj9KQUnXxVPDzBWULqNphzzMWmui8clkJeplO1REuw lv+Q== 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; bh=KNMD4bkMUVMkqysJ6AyH6R9qkm7h+g1koAiFnaEo2LM=; b=lr+ia378Bsq89F/GTM994R7nXh47CSwnHmfGNLFqpy4kbccGyDAyvr4Dty/wmNfNO9 pCgtpo4IswFTpMrczowOUkh3t4fFQmUdfdmBnoWWiFlyLl/jFJSud2rlB8reyBualRse 2BC87Nmght27xsv4ScqtZwIsCK+HCgzo45wAcr9kM4aXamGUvDkgtFIPQza2s0JYHKQN SrBtjqZAqfvODZAWnQSPNKzHWlB/qDtHK5AaabCpxMk2+fzU0a9TecIdRXrhklTsVfjU mGD6n6nsijgnSLJSKnGfVI+fIDZL0ZTrlNUYyU3FBsYqEk7o9aOnfj3pX9v/1nC/yEzA PC9w== X-Gm-Message-State: AOPr4FX2zRKCeWfoBOLR+6H6IjsB1hWE34i/t+cuq2R6OiyRg0heYTy8FhdxMKEe5PUwfg== X-Received: by 10.55.73.6 with SMTP id w6mr41379136qka.82.1461617492599; Mon, 25 Apr 2016 13:51:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Apr 2016 13:51:32 -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 1/2] tcp: remove an unnecessary check in tcp_tx_timestamp Date: Mon, 25 Apr 2016 16:51:12 -0400 Message-Id: <1461617473-11349-1-git-send-email-soheil.kdev@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Soheil Hassas Yeganeh tcp_tx_timestamp() receives tsflags as a parameter. tsflags is initialized to sk->sk_tsflags and is overridden by control messages. As a result the "sk->sk_tsflags || tsflags" is the same expression as "tsflags" Remove the redundant check for sk->sk_tsflags in tcp_tx_timestamp. Signed-off-by: Soheil Hassas Yeganeh --- 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);