diff options
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index e63ae4c9691d..7c83cb8bf137 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -2673,7 +2673,7 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, | |||
2673 | int tcp_header_size; | 2673 | int tcp_header_size; |
2674 | int mss; | 2674 | int mss; |
2675 | 2675 | ||
2676 | skb = alloc_skb(MAX_TCP_HEADER + 15, sk_gfp_atomic(sk, GFP_ATOMIC)); | 2676 | skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15, 1, GFP_ATOMIC); |
2677 | if (unlikely(!skb)) { | 2677 | if (unlikely(!skb)) { |
2678 | dst_release(dst); | 2678 | dst_release(dst); |
2679 | return NULL; | 2679 | return NULL; |
@@ -2817,6 +2817,8 @@ void tcp_connect_init(struct sock *sk) | |||
2817 | 2817 | ||
2818 | if (likely(!tp->repair)) | 2818 | if (likely(!tp->repair)) |
2819 | tp->rcv_nxt = 0; | 2819 | tp->rcv_nxt = 0; |
2820 | else | ||
2821 | tp->rcv_tstamp = tcp_time_stamp; | ||
2820 | tp->rcv_wup = tp->rcv_nxt; | 2822 | tp->rcv_wup = tp->rcv_nxt; |
2821 | tp->copied_seq = tp->rcv_nxt; | 2823 | tp->copied_seq = tp->rcv_nxt; |
2822 | 2824 | ||