From 37682616fa5e75bcdc645270e276c6f3f5ccfacb Mon Sep 17 00:00:00 2001
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Tue, 6 Apr 2010 05:39:52 +0000
Subject: [PATCH] --- yaml --- r: 193974 b: refs/heads/master c:
 842509b8591fd9a40f5532a5f049bd29804af6d6 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/net/socket.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2adc1cf9f54d..6310e8114df7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6537d6742985da1fbf12ae26cde6a096fd35b5c
+refs/heads/master: 842509b8591fd9a40f5532a5f049bd29804af6d6
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index 769c386bd428..ae904b58d9f5 100644
--- a/trunk/net/socket.c
+++ b/trunk/net/socket.c
@@ -619,10 +619,9 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
 			put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMP,
 				 sizeof(tv), &tv);
 		} else {
-			struct timespec ts;
-			skb_get_timestampns(skb, &ts);
+			skb_get_timestampns(skb, &ts[0]);
 			put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPNS,
-				 sizeof(ts), &ts);
+				 sizeof(ts[0]), &ts[0]);
 		}
 	}