From 8e90e4ca4d4a9f4e25643d5a6a85bbcd0a8227ca Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Tue, 28 Sep 2010 19:30:14 +0000
Subject: [PATCH] --- yaml --- r: 214809 b: refs/heads/master c:
 1b9f409293529da4630bfc5d6d8e7d7451a6ccb5 h: refs/heads/master i:   214807:
 fb7f6334ff28847f20743dd7da52e3d9c2d4e2bf 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 5b2372b8111a..f54c4f2b5474 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a64de47c091e4a337fa9763315cb6f2fbf0c583b
+refs/heads/master: 1b9f409293529da4630bfc5d6d8e7d7451a6ccb5
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
index 914a60c7ad62..4fee0424af7e 100644
--- a/trunk/include/net/tcp.h
+++ b/trunk/include/net/tcp.h
@@ -346,8 +346,6 @@ static inline void tcp_dec_quickack_mode(struct sock *sk,
 	}
 }
 
-extern void tcp_enter_quickack_mode(struct sock *sk);
-
 #define	TCP_ECN_OK		1
 #define	TCP_ECN_QUEUE_CWR	2
 #define	TCP_ECN_DEMAND_CWR	4
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index fabc09a58d7f..eaf20e7e61da 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -182,7 +182,7 @@ static void tcp_incr_quickack(struct sock *sk)
 		icsk->icsk_ack.quick = min(quickacks, TCP_MAX_QUICKACKS);
 }
 
-void tcp_enter_quickack_mode(struct sock *sk)
+static void tcp_enter_quickack_mode(struct sock *sk)
 {
 	struct inet_connection_sock *icsk = inet_csk(sk);
 	tcp_incr_quickack(sk);