Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b3a6926 authored by Razvan Ghitulete's avatar Razvan Ghitulete Committed by David S. Miller
Browse files

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: default avatarRazvan Ghitulete <rghitulete@ixiacom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65e0736b

net/ipv4/tcp_input.c

+1 −2
Original line number Diff line number Diff line
@@ -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;