diff --git a/[refs] b/[refs] index 7f78893df89f..095b25ba81d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e01bf1c83332c4653ffd30eed20a94a9c83d82b2 +refs/heads/master: f37f0afb2916ccf287428983026261db78c7661a diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 2654c147c004..7a0567b4b2c9 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -1725,7 +1725,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT; - sk->sk_stamp = ktime_set(-1L, -1L); + sk->sk_stamp = ktime_set(-1L, 0); atomic_set(&sk->sk_refcnt, 1); atomic_set(&sk->sk_drops, 0);