aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRazvan Ghitulete <rghitulete@ixiacom.com>2012-08-14 09:30:20 -0400
committerDavid S. Miller <davem@davemloft.net>2012-08-15 18:23:46 -0400
commit1b3a6926fc3430116c97c333f7cf901b86779008 (patch)
tree36e65640e0c2025b841803a26edaaf35573ea8db
parent65e0736bc2ac314bd374e93c24dd0698ac5ee66d (diff)
net: remove wrong initialization for snd_wl1
The field tp->snd_wl1 is twice initialized, the second time seems to be wrong as it may overwrite any update in tcp_ack. Signed-off-by: Razvan Ghitulete <rghitulete@ixiacom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_input.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index fa2c2c2cac2..c423317eb71 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5744,7 +5744,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
5744 5744
5745 TCP_ECN_rcv_synack(tp, th); 5745 TCP_ECN_rcv_synack(tp, th);
5746 5746
5747 tp->snd_wl1 = TCP_SKB_CB(skb)->seq; 5747 tcp_init_wl(tp, TCP_SKB_CB(skb)->seq);
5748 tcp_ack(sk, skb, FLAG_SLOWPATH); 5748 tcp_ack(sk, skb, FLAG_SLOWPATH);
5749 5749
5750 /* Ok.. it's good. Set up sequence numbers and 5750 /* 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,
5757 * never scaled. 5757 * never scaled.
5758 */ 5758 */
5759 tp->snd_wnd = ntohs(th->window); 5759 tp->snd_wnd = ntohs(th->window);
5760 tcp_init_wl(tp, TCP_SKB_CB(skb)->seq);
5761 5760
5762 if (!tp->rx_opt.wscale_ok) { 5761 if (!tp->rx_opt.wscale_ok) {
5763 tp->rx_opt.snd_wscale = tp->rx_opt.rcv_wscale = 0; 5762 tp->rx_opt.snd_wscale = tp->rx_opt.rcv_wscale = 0;