From af5c8bae5b745c2b7c792c58bd1a64a65e574fe4 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 22 Jan 2009 13:24:49 -0800
Subject: [PATCH] --- yaml --- r: 135886 b: refs/heads/master c:
 44ad532b3277f0cae55bfe0625d3140cf73af450 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/dlm/lowcomms.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 38aee833de07..82ae0b869dfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 305a47b17c6efcc0e7b67b0bd41e2c12b7af758b
+refs/heads/master: 44ad532b3277f0cae55bfe0625d3140cf73af450
diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c
index 103a5ebd1371..bf09262b8b01 100644
--- a/trunk/fs/dlm/lowcomms.c
+++ b/trunk/fs/dlm/lowcomms.c
@@ -53,6 +53,7 @@
 #include <linux/mutex.h>
 #include <linux/sctp.h>
 #include <net/sctp/user.h>
+#include <net/ipv6.h>
 
 #include "dlm_internal.h"
 #include "lowcomms.h"
@@ -250,8 +251,7 @@ static int nodeid_to_addr(int nodeid, struct sockaddr *retaddr)
 	} else {
 		struct sockaddr_in6 *in6  = (struct sockaddr_in6 *) &addr;
 		struct sockaddr_in6 *ret6 = (struct sockaddr_in6 *) retaddr;
-		memcpy(&ret6->sin6_addr, &in6->sin6_addr,
-		       sizeof(in6->sin6_addr));
+		ipv6_addr_copy(&ret6->sin6_addr, &in6->sin6_addr);
 	}
 
 	return 0;