From patchwork Sat Sep 20 17:52:24 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 729 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.176.167]) by ozlabs.org (Postfix) with ESMTP id E2CF3DDEE1 for ; Sun, 21 Sep 2008 03:53:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751467AbYITRwz (ORCPT ); Sat, 20 Sep 2008 13:52:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751400AbYITRwx (ORCPT ); Sat, 20 Sep 2008 13:52:53 -0400 Received: from courier.cs.helsinki.fi ([128.214.9.1]:59235 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750990AbYITRwj (ORCPT ); Sat, 20 Sep 2008 13:52:39 -0400 Received: from wrl-59.cs.helsinki.fi (wrl-59.cs.helsinki.fi [128.214.166.179]) (AUTH: PLAIN cs-relay, TLS: TLSv1/SSLv3,256bits,AES256-SHA) by mail.cs.helsinki.fi with esmtp; Sat, 20 Sep 2008 20:52:34 +0300 id 0005BED7.48D53862.00002CA6 Received: by wrl-59.cs.helsinki.fi (Postfix, from userid 50795) id 622D9A00A7; Sat, 20 Sep 2008 20:52:34 +0300 (EEST) From: "=?ISO-8859-1?Q?Ilpo_J=E4rvinen?=" To: David Miller Cc: netdev@vger.kernel.org, "=?utf-8?q?Ilpo=20J=E4rvinen?=" Subject: [PATCH net-next 06/15] tcp: No need to clear retransmit_skb_hint when SACKing Date: Sat, 20 Sep 2008 20:52:24 +0300 Message-Id: <1221933153-11874-7-git-send-email-ilpo.jarvinen@helsinki.fi> X-Mailer: git-send-email 1.5.4.2.156.ge3c5 In-Reply-To: <1221933153-11874-6-git-send-email-ilpo.jarvinen@helsinki.fi> References: <1221933153-11874-1-git-send-email-ilpo.jarvinen@helsinki.fi> <1221933153-11874-2-git-send-email-ilpo.jarvinen@helsinki.fi> <1221933153-11874-3-git-send-email-ilpo.jarvinen@helsinki.fi> <1221933153-11874-4-git-send-email-ilpo.jarvinen@helsinki.fi> <1221933153-11874-5-git-send-email-ilpo.jarvinen@helsinki.fi> <1221933153-11874-6-git-send-email-ilpo.jarvinen@helsinki.fi> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Because lost counter no longer requires tuning, this is trivial to remove (the tuning wouldn't have been too hard either) because no "new" retransmittable skb appeared below retransmit_skb_hint when SACKing for sure. Signed-off-by: Ilpo Järvinen --- net/ipv4/tcp_input.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d7544ec..8a6dec8 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1296,9 +1296,6 @@ static int tcp_sacktag_one(struct sk_buff *skb, struct sock *sk, ~(TCPCB_LOST|TCPCB_SACKED_RETRANS); tp->lost_out -= tcp_skb_pcount(skb); tp->retrans_out -= tcp_skb_pcount(skb); - - /* clear lost hint */ - tp->retransmit_skb_hint = NULL; } } else { if (!(sacked & TCPCB_RETRANS)) { @@ -1317,9 +1314,6 @@ static int tcp_sacktag_one(struct sk_buff *skb, struct sock *sk, if (sacked & TCPCB_LOST) { TCP_SKB_CB(skb)->sacked &= ~TCPCB_LOST; tp->lost_out -= tcp_skb_pcount(skb); - - /* clear lost hint */ - tp->retransmit_skb_hint = NULL; } } @@ -1349,7 +1343,6 @@ static int tcp_sacktag_one(struct sk_buff *skb, struct sock *sk, if (dup_sack && (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS)) { TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS; tp->retrans_out -= tcp_skb_pcount(skb); - tp->retransmit_skb_hint = NULL; } return flag;