From a4f3394205f021cab7f6eed4075a706025510c29 Mon Sep 17 00:00:00 2001
From: Mark Glines <mark@glines.org>
Date: Thu, 31 May 2007 15:44:48 -0700
Subject: [PATCH] --- yaml --- r: 57325 b: refs/heads/master c:
 3f196eb519a419bf83ecc22753943fd0a0de4f8f h: refs/heads/master i:   57323:
 1ad9a112751e54d95749412c9bf1ee205b6f7bdb v: v3

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

diff --git a/[refs] b/[refs]
index 7e99e27b9d00..e1cc3323c55d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 278a3de5abc7901805689a66340b5af9882b4f9a
+refs/heads/master: 3f196eb519a419bf83ecc22753943fd0a0de4f8f
diff --git a/trunk/net/ipv4/inet_connection_sock.c b/trunk/net/ipv4/inet_connection_sock.c
index 43fb1600f1f0..fbe7714f21d0 100644
--- a/trunk/net/ipv4/inet_connection_sock.c
+++ b/trunk/net/ipv4/inet_connection_sock.c
@@ -31,10 +31,8 @@ EXPORT_SYMBOL(inet_csk_timer_bug_msg);
 
 /*
  * This array holds the first and last local port number.
- * For high-usage systems, use sysctl to change this to
- * 32768-61000
  */
-int sysctl_local_port_range[2] = { 1024, 4999 };
+int sysctl_local_port_range[2] = { 32768, 61000 };
 
 int inet_csk_bind_conflict(const struct sock *sk,
 			   const struct inet_bind_bucket *tb)
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 766314505c09..cd3c7e95de9e 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -2464,13 +2464,10 @@ void __init tcp_init(void)
 			order++)
 		;
 	if (order >= 4) {
-		sysctl_local_port_range[0] = 32768;
-		sysctl_local_port_range[1] = 61000;
 		tcp_death_row.sysctl_max_tw_buckets = 180000;
 		sysctl_tcp_max_orphans = 4096 << (order - 4);
 		sysctl_max_syn_backlog = 1024;
 	} else if (order < 3) {
-		sysctl_local_port_range[0] = 1024 * (3 - order);
 		tcp_death_row.sysctl_max_tw_buckets >>= (3 - order);
 		sysctl_tcp_max_orphans >>= (3 - order);
 		sysctl_max_syn_backlog = 128;