From 8e789d5834dd18be8b018ba02bebf6c99f113eff Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Sun, 13 Apr 2008 21:39:26 -0700
Subject: [PATCH] --- yaml --- r: 88312 b: refs/heads/master c:
 f37f0afb2916ccf287428983026261db78c7661a h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);