From patchwork Tue Nov 25 14:02:22 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: 10631 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.176.167]) by ozlabs.org (Postfix) with ESMTP id E863EDDDEA for ; Wed, 26 Nov 2008 01:02:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752015AbYKYOCZ (ORCPT ); Tue, 25 Nov 2008 09:02:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750963AbYKYOCY (ORCPT ); Tue, 25 Nov 2008 09:02:24 -0500 Received: from courier.cs.helsinki.fi ([128.214.9.1]:45533 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750745AbYKYOCX (ORCPT ); Tue, 25 Nov 2008 09:02:23 -0500 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; Tue, 25 Nov 2008 16:02:22 +0200 id 0009C559.492C056E.00002123 Received: by wrl-59.cs.helsinki.fi (Postfix, from userid 50795) id 98C25A0096; Tue, 25 Nov 2008 16:02:22 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by wrl-59.cs.helsinki.fi (Postfix) with ESMTP id 91465A0091; Tue, 25 Nov 2008 16:02:22 +0200 (EET) Date: Tue, 25 Nov 2008 16:02:22 +0200 (EET) From: "=?ISO-8859-1?Q?Ilpo_J=E4rvinen?=" X-X-Sender: ijjarvin@wrl-59.cs.helsinki.fi To: David Miller cc: Netdev Subject: Re: [PATCH 02/10] tcp: move tcp_simple_retransmit to tcp_input In-Reply-To: <20081124.211039.01283732.davem@davemloft.net> Message-ID: References: <1227536527-29713-1-git-send-email-ilpo.jarvinen@helsinki.fi> <1227536527-29713-2-git-send-email-ilpo.jarvinen@helsinki.fi> <1227536527-29713-3-git-send-email-ilpo.jarvinen@helsinki.fi> <20081124.211039.01283732.davem@davemloft.net> MIME-Version: 1.0 Content-ID: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, 24 Nov 2008, David Miller wrote: > From: "Ilpo Järvinen" > Date: Mon, 24 Nov 2008 16:21:59 +0200 > > > Signed-off-by: Ilpo Järvinen > > I applied this with a minor modification. > > tcp_skb_mark_lost_uncond_verify() can now be marked static, so I made > that change. > > BTW, that would have generated a sparse warning had you sparse on > your changes :) I did use sparse, that is, when I finally remembered :-) but the results didn't made to the series I sent but I followed up with v2 of this particular patch. ...I also realized that another function can be made static as a result of this move, patch below. diff --git a/include/net/tcp.h b/include/net/tcp.h index 2653924..e8ae90a 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -761,8 +761,6 @@ static inline unsigned int tcp_packets_in_flight(const struct tcp_sock *tp) return tp->packets_out - tcp_left_out(tp) + tp->retrans_out; } -extern int tcp_limit_reno_sacked(struct tcp_sock *tp); - /* If cwnd > ssthresh, we may raise ssthresh to be half-way to cwnd. * The exception is rate halving phase, when cwnd is decreasing towards * ssthresh. diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 9f8a80b..d67b6e9 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1940,7 +1940,7 @@ out: /* Limits sacked_out so that sum with lost_out isn't ever larger than * packets_out. Returns zero if sacked_out adjustement wasn't necessary. */ -int tcp_limit_reno_sacked(struct tcp_sock *tp) +static int tcp_limit_reno_sacked(struct tcp_sock *tp) { u32 holes;