From patchwork Sat Sep 6 15:18:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Cardwell X-Patchwork-Id: 386629 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 BD6C81400E7 for ; Sun, 7 Sep 2014 01:18:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751676AbaIFPS0 (ORCPT ); Sat, 6 Sep 2014 11:18:26 -0400 Received: from mail-ig0-f202.google.com ([209.85.213.202]:61835 "EHLO mail-ig0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751347AbaIFPSZ (ORCPT ); Sat, 6 Sep 2014 11:18:25 -0400 Received: by mail-ig0-f202.google.com with SMTP id r2so2270283igi.1 for ; Sat, 06 Sep 2014 08:18:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=9lZDSZtGxMEg2cLssDxL1lQr4H6IX9P9B6i7mkNpR5k=; b=OYT8xulz8+BOhgxvJYP4mqaIhRac/yIqISWwrCTSJZtLYHjZtHXCOv4E3v8VCDCOMg 5Kufvnt8nY6zkbrLzKAzFXWzCUQjItGmwG0JCi6Vw5vAFYM4C6PDmZ5Z5exWAVq9zjPg u7m4oT989b27N2p22qrEmJIwyBke42x1gEIManFoj2MD3ww1V+IagKDr0VRNmkDfZC2e YhYpGzVSMbqjXQxxwW3UHfrjTWc8ry9+7D7xRf5KQjX4CZDi0MUYUqqxCR6faOBSlWvB T4l6GADHujRvzV8abCaz7KqQ09ekEFRJmpxo52dfImHZrcKnJxUE6a7AsXEBJaoL0/8e Qtqg== 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=9lZDSZtGxMEg2cLssDxL1lQr4H6IX9P9B6i7mkNpR5k=; b=mf0bdn4ZM10d4OfYz/MZCmOBlWKpoCSQ8L27zsz/prSTweHQxLqH/XHFExFb+G8bbd JG6UFNGHZ+1YPhwQT0FJaNvXdWgY+iO1MvKDkgBF+EPnRY9aD9STvA2QbxnCT7JMZ7I0 gEUAMaiAr7e045NVqEk2M6BA1Etlm8bzys4LEn+6/3pkQJhFb3gp93J7ntyPUw4CW9n+ +KzpnJ11wjoWo4Vb2qL8n2pDpeZz7IBJaUTvBnYClTw5+CfaC6oampn2XHwxZO+T84A9 Oot8kbXOimK4cHqWogGfyMa96BKGa8pdNDMaBoXsLt3lcnU0UXacsws08iEDIZCVl0XE moTw== X-Gm-Message-State: ALoCoQk/6Ipnxfm7To9ju2tkumCgCQDOuMqfmhLIue7ZtoO5/DE7JD+U+a80htYoHt9lfgSVe08i X-Received: by 10.42.152.201 with SMTP id j9mr11200319icw.5.1410016704745; Sat, 06 Sep 2014 08:18:24 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id c77si666385yha.5.2014.09.06.08.18.24 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 06 Sep 2014 08:18:24 -0700 (PDT) Received: from coy.nyc.corp.google.com (coy.nyc.corp.google.com [172.26.105.221]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 9B6E931C23A; Sat, 6 Sep 2014 08:18:24 -0700 (PDT) Received: by coy.nyc.corp.google.com (Postfix, from userid 4318) id 359461C08D9; Sat, 6 Sep 2014 11:18:24 -0400 (EDT) From: Neal Cardwell To: David Miller Cc: edumazet@google.com, ycheng@google.com, netdev@vger.kernel.org, Neal Cardwell Subject: [PATCH net-next] tcp: remove obsolete comment about TCP_SKB_CB(skb)->when in tcp_fragment() Date: Sat, 6 Sep 2014 11:18:20 -0400 Message-Id: <1410016700-9145-1-git-send-email-ncardwell@google.com> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The TCP_SKB_CB(skb)->when field no longer exists as of recent change 7faee5c0d514 ("tcp: remove TCP_SKB_CB(skb)->when"). And in any case, tcp_fragment() is called on already-transmitted packets from the __tcp_retransmit_skb() call site, so copying timestamps of any kind in this spot is quite sensible. Signed-off-by: Neal Cardwell Reported-by: Yuchung Cheng Acked-by: Eric Dumazet --- net/ipv4/tcp_output.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 3b22dcb..7f1280d 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1146,9 +1146,6 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, buff->ip_summed = skb->ip_summed; - /* Looks stupid, but our code really uses when of - * skbs, which it never sent before. --ANK - */ buff->tstamp = skb->tstamp; tcp_fragment_tstamp(skb, buff);