From bdff3b875ab577cb62ff6645d88c900695aff537 Mon Sep 17 00:00:00 2001
From: Folkert van Heusden <folkert@vanheusden.com>
Date: Tue, 3 May 2005 14:36:45 -0700
Subject: [PATCH] --- yaml --- r: 831 b: refs/heads/master c:
 c3924c70dd3bddc28b99ccd1688bd281bad1a9be h: refs/heads/master i:   829:
 b5278381219545265c2804ed4b43324b7738fbdb   827:
 0955939a422de23ca35ed8164e34d9da18a60c5d   823:
 5e69b2095ecb29895ebee8450d976d263a03c913   815:
 6956eba1e39e9b674d4bdb4c5d42dd135b08d759   799:
 f267d993491982106bf13a38125be304fb61af44   767:
 5686ca0dc6cc523e8fabb3ca70e570b027c6d4b0 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/tcp_ipv6.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 11093d65a1f3..11fe2150489c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b2531bdc54e19717de5cb161d57e5ee0a7725ff
+refs/heads/master: c3924c70dd3bddc28b99ccd1688bd281bad1a9be
diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
index 4760c85e19db..0f69e800a0ad 100644
--- a/trunk/net/ipv6/tcp_ipv6.c
+++ b/trunk/net/ipv6/tcp_ipv6.c
@@ -139,9 +139,12 @@ static int tcp_v6_get_port(struct sock *sk, unsigned short snum)
 		int rover;
 
 		spin_lock(&tcp_portalloc_lock);
-		rover = tcp_port_rover;
+		if (tcp_port_rover < low)
+			rover = low;
+		else
+			rover = tcp_port_rover;
 		do {	rover++;
-			if ((rover < low) || (rover > high))
+			if (rover > high)
 				rover = low;
 			head = &tcp_bhash[tcp_bhashfn(rover)];
 			spin_lock(&head->lock);