From 167b71192fc1385c8736d338ec9dbdb8915188b7 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 5 Mar 2008 18:53:55 -0800
Subject: [PATCH] --- yaml --- r: 87230 b: refs/heads/master c:
 1ff82fe0024e8070c38346b8abc1ff09612dea4c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/rxrpc/ar-recvmsg.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eb260de4bcd6..87abba823537 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02ff05c49d7804f2574f358a937b43a41d15e36e
+refs/heads/master: 1ff82fe0024e8070c38346b8abc1ff09612dea4c
diff --git a/trunk/net/rxrpc/ar-recvmsg.c b/trunk/net/rxrpc/ar-recvmsg.c
index f19121d4795b..a39bf97f8830 100644
--- a/trunk/net/rxrpc/ar-recvmsg.c
+++ b/trunk/net/rxrpc/ar-recvmsg.c
@@ -143,7 +143,8 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,
 		/* copy the peer address and timestamp */
 		if (!continue_call) {
 			if (msg->msg_name && msg->msg_namelen > 0)
-				memcpy(&msg->msg_name, &call->conn->trans->peer->srx,
+				memcpy(msg->msg_name,
+				       &call->conn->trans->peer->srx,
 				       sizeof(call->conn->trans->peer->srx));
 			sock_recv_timestamp(msg, &rx->sk, skb);
 		}