diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-26 15:34:42 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-26 15:34:42 -0500 |
| commit | 8e22e1b3499a446df48c2b26667ca36c55bf864c (patch) | |
| tree | 5329f98b3eb3c95a9dcbab0fa4f9b6e62f0e788d /net/ipv4/tcp_fastopen.c | |
| parent | 00d3c14f14d51babd8aeafd5fa734ccf04f5ca3d (diff) | |
| parent | 64a577196d66b44e37384bc5c4d78c61f59d5b2a (diff) | |
Merge airlied/drm-next into drm-misc-next
Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'net/ipv4/tcp_fastopen.c')
| -rw-r--r-- | net/ipv4/tcp_fastopen.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c index f51919535ca7..dd2560c83a85 100644 --- a/net/ipv4/tcp_fastopen.c +++ b/net/ipv4/tcp_fastopen.c | |||
| @@ -205,6 +205,7 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk, | |||
| 205 | * scaled. So correct it appropriately. | 205 | * scaled. So correct it appropriately. |
| 206 | */ | 206 | */ |
| 207 | tp->snd_wnd = ntohs(tcp_hdr(skb)->window); | 207 | tp->snd_wnd = ntohs(tcp_hdr(skb)->window); |
| 208 | tp->max_window = tp->snd_wnd; | ||
| 208 | 209 | ||
| 209 | /* Activate the retrans timer so that SYNACK can be retransmitted. | 210 | /* Activate the retrans timer so that SYNACK can be retransmitted. |
| 210 | * The request socket is not added to the ehash | 211 | * The request socket is not added to the ehash |