[02/10] tcp: move tcp_simple_retransmit to tcp_input

Message ID Pine.LNX.4.64.0811251534360.31282@wrl-59.cs.helsinki.fi
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Ilpo Järvinen Nov. 25, 2008, 2:02 p.m.
On Mon, 24 Nov 2008, David Miller wrote:

> From: "Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
> Date: Mon, 24 Nov 2008 16:21:59 +0200
> > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> 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.


David Miller Nov. 25, 2008, 9:45 p.m. | #1
From: "Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Tue, 25 Nov 2008 16:02:22 +0200 (EET)

> [PATCH] tcp: tcp_limit_reno_sacked can become static
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

Applied, thanks Ilpo.
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/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;