From patchwork Wed Mar 28 04:23:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Yu X-Patchwork-Id: 149082 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 757F3B6EEC for ; Wed, 28 Mar 2012 15:23:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751090Ab2C1EXW (ORCPT ); Wed, 28 Mar 2012 00:23:22 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:48905 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750804Ab2C1EXV (ORCPT ); Wed, 28 Mar 2012 00:23:21 -0400 Received: by pbcun15 with SMTP id un15so1182299pbc.19 for ; Tue, 27 Mar 2012 21:23:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=OgYVG9u8tjXCRogJil5WeqCAJNYTMOwCWo9tJ7QuHPs=; b=tOPaVeRpOYBsktYfThVYToCv1+1Cn1g5+YrDF4ebjUU8UK21yj2ytyxxw/NsDttg7C AfTqhWxmU6H83ULbEQN6dVFRyQ1/8N7XQInfVbcHerR5sXggDx5Eu5pFCnrtfE7jgw4M VnfZBTBgrxVweyuEqKFq2buEQgyQzAQKqGfZ3a8zgoL4iauK4lE0KY2neJK6rfolNfu0 I2a2AWhZ499ZDER/3RLUc/qclabTnNTqsGB6EijfAPjOpMVzwOAlNXk2z5vwsN+tzR0F BCYikvbyH2ZXjS+BtcYwnGVHhE5RlYFUO71g6Tuu7EeXT7tWqga/OCJ0b/VDiNl3OArl OY7w== Received: by 10.68.234.195 with SMTP id ug3mr69521843pbc.4.1332908601477; Tue, 27 Mar 2012 21:23:21 -0700 (PDT) Received: from [10.32.101.225] ([182.92.247.2]) by mx.google.com with ESMTPS id z7sm1783373pbk.63.2012.03.27.21.23.19 (version=SSLv3 cipher=OTHER); Tue, 27 Mar 2012 21:23:20 -0700 (PDT) Message-ID: <4F729235.8040706@gmail.com> Date: Wed, 28 Mar 2012 12:23:17 +0800 From: Li Yu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120310 Thunderbird/11.0 MIME-Version: 1.0 To: netdev@vger.kernel.org Subject: [PATCH] tcp: remove useless update for flag parameter in tcp_enter_frto_loss() Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It seem that we forget remove below two lines after copying code :) This update never impacts others. Sorry for last mail with legal notices improperly, I used wrong mail. Signed-off-by Li Yu tp->undo_marker = 0; --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index e886e2f..b2f8ada 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -2169,8 +2169,6 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag) /* For some reason this R-bit might get cleared? */ if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) tp->retrans_out += tcp_skb_pcount(skb); - /* ...enter this if branch just for the first segment */ - flag |= FLAG_DATA_ACKED; } else { if (TCP_SKB_CB(skb)->sacked & TCPCB_RETRANS)