diff options
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index e4442a293eb0..5ecd7aa25979 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -3416,7 +3416,7 @@ static int tcp_ack_update_window(struct sock *sk, struct sk_buff *skb, u32 ack, | |||
3416 | 3416 | ||
3417 | if (tcp_may_update_window(tp, ack, ack_seq, nwin)) { | 3417 | if (tcp_may_update_window(tp, ack, ack_seq, nwin)) { |
3418 | flag |= FLAG_WIN_UPDATE; | 3418 | flag |= FLAG_WIN_UPDATE; |
3419 | tcp_update_wl(tp, ack, ack_seq); | 3419 | tcp_update_wl(tp, ack_seq); |
3420 | 3420 | ||
3421 | if (tp->snd_wnd != nwin) { | 3421 | if (tp->snd_wnd != nwin) { |
3422 | tp->snd_wnd = nwin; | 3422 | tp->snd_wnd = nwin; |
@@ -3621,7 +3621,7 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag) | |||
3621 | * No more checks are required. | 3621 | * No more checks are required. |
3622 | * Note, we use the fact that SND.UNA>=SND.WL2. | 3622 | * Note, we use the fact that SND.UNA>=SND.WL2. |
3623 | */ | 3623 | */ |
3624 | tcp_update_wl(tp, ack, ack_seq); | 3624 | tcp_update_wl(tp, ack_seq); |
3625 | tp->snd_una = ack; | 3625 | tp->snd_una = ack; |
3626 | flag |= FLAG_WIN_UPDATE; | 3626 | flag |= FLAG_WIN_UPDATE; |
3627 | 3627 | ||
@@ -5418,7 +5418,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, | |||
5418 | * never scaled. | 5418 | * never scaled. |
5419 | */ | 5419 | */ |
5420 | tp->snd_wnd = ntohs(th->window); | 5420 | tp->snd_wnd = ntohs(th->window); |
5421 | tcp_init_wl(tp, TCP_SKB_CB(skb)->ack_seq, TCP_SKB_CB(skb)->seq); | 5421 | tcp_init_wl(tp, TCP_SKB_CB(skb)->seq); |
5422 | 5422 | ||
5423 | if (!tp->rx_opt.wscale_ok) { | 5423 | if (!tp->rx_opt.wscale_ok) { |
5424 | tp->rx_opt.snd_wscale = tp->rx_opt.rcv_wscale = 0; | 5424 | tp->rx_opt.snd_wscale = tp->rx_opt.rcv_wscale = 0; |
@@ -5679,8 +5679,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, | |||
5679 | tp->snd_una = TCP_SKB_CB(skb)->ack_seq; | 5679 | tp->snd_una = TCP_SKB_CB(skb)->ack_seq; |
5680 | tp->snd_wnd = ntohs(th->window) << | 5680 | tp->snd_wnd = ntohs(th->window) << |
5681 | tp->rx_opt.snd_wscale; | 5681 | tp->rx_opt.snd_wscale; |
5682 | tcp_init_wl(tp, TCP_SKB_CB(skb)->ack_seq, | 5682 | tcp_init_wl(tp, TCP_SKB_CB(skb)->seq); |
5683 | TCP_SKB_CB(skb)->seq); | ||
5684 | 5683 | ||
5685 | /* tcp_ack considers this ACK as duplicate | 5684 | /* tcp_ack considers this ACK as duplicate |
5686 | * and does not calculate rtt. | 5685 | * and does not calculate rtt. |