From ef87780ef0b9b983cc469716a1e49be7116cd558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Tue, 25 Nov 2008 13:45:29 -0800
Subject: [PATCH] --- yaml --- r: 122149 b: refs/heads/master c:
 8eecaba900e89643029fd2c253ad8ebb60761165 h: refs/heads/master i:   122147:
 4cdd71e41d2e2ec2dc94f9c64084476e8fcaddfc v: v3

---
 [refs]                     | 2 +-
 trunk/include/net/tcp.h    | 2 --
 trunk/net/ipv4/tcp_input.c | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e140a0aa241a..db482d998a22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f9889a20cd2854bc6305198255c617b0b4eb719
+refs/heads/master: 8eecaba900e89643029fd2c253ad8ebb60761165
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
index 265392470b26..e8ae90a8c35e 100644
--- a/trunk/include/net/tcp.h
+++ b/trunk/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/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 9f8a80ba17bd..d67b6e9cc540 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -1940,7 +1940,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb,
 /* 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;