The following commit has been merged in the batman-adv/next branch: commit 1b3a6926fc3430116c97c333f7cf901b86779008 Author: Razvan Ghitulete rghitulete@ixiacom.com Date: Tue Aug 14 16:30:20 2012 +0300
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
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index fa2c2c2..c423317 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,
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;