From ebb0cd6407dc5dbb30142cb8f3391c8306c7a2ee Mon Sep 17 00:00:00 2001
From: Razvan Ghitulete <rghitulete@ixiacom.com>
Date: Tue, 14 Aug 2012 16:30:20 +0300
Subject: [PATCH] --- yaml --- r: 327427 b: refs/heads/master c:
 1b3a6926fc3430116c97c333f7cf901b86779008 h: refs/heads/master i:   327425:
 93658695c28a1cfa35e342a172c3526bdda4769f   327423:
 5186ad1aece7ed148ada83636a46f2a4a087844c v: v3

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

diff --git a/[refs] b/[refs]
index c43d1a86b523..ce1a40ce207d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65e0736bc2ac314bd374e93c24dd0698ac5ee66d
+refs/heads/master: 1b3a6926fc3430116c97c333f7cf901b86779008
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index fa2c2c2cac2d..c423317eb719 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -5744,7 +5744,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
 
 		TCP_ECN_rcv_synack(tp, th);
 
-		tp->snd_wl1 = TCP_SKB_CB(skb)->seq;
+		tcp_init_wl(tp, TCP_SKB_CB(skb)->seq);
 		tcp_ack(sk, skb, FLAG_SLOWPATH);
 
 		/* Ok.. it's good. Set up sequence numbers and
@@ -5757,7 +5757,6 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
 		 * never scaled.
 		 */
 		tp->snd_wnd = ntohs(th->window);
-		tcp_init_wl(tp, TCP_SKB_CB(skb)->seq);
 
 		if (!tp->rx_opt.wscale_ok) {
 			tp->rx_opt.snd_wscale = tp->rx_opt.rcv_wscale = 0;