From 42da1f21a860d104aecc6fa04a7e2f17951f2b9c Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 4 Feb 2013 08:10:08 -0500
Subject: [PATCH] --- yaml --- r: 359727 b: refs/heads/master c:
 155a345a52e6cda18946efe2529d99d5040fad6d h: refs/heads/master i:   359725:
 d236ec2b57f6cc98615cd6c7da488ece2fff75a5   359723:
 a5871deea050dfff1e0efcba3777afecb76c978b   359719:
 2f968478a3fd1153e6dd4cf7b3c3143acb085b6a   359711:
 c66a324517520026b15ce34980639b27618fb677 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/sunrpc/clnt.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c5ca45509aff..f76d62cfb59b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3abdb6071250b896b9d5b6e0c310d6e95666b4d7
+refs/heads/master: 155a345a52e6cda18946efe2529d99d5040fad6d
diff --git a/trunk/include/linux/sunrpc/clnt.h b/trunk/include/linux/sunrpc/clnt.h
index 47354a25a927..6a7c2619a355 100644
--- a/trunk/include/linux/sunrpc/clnt.h
+++ b/trunk/include/linux/sunrpc/clnt.h
@@ -242,6 +242,7 @@ static inline bool __rpc_copy_addr6(struct sockaddr *dst,
 
 	dsin6->sin6_family = ssin6->sin6_family;
 	dsin6->sin6_addr = ssin6->sin6_addr;
+	dsin6->sin6_scope_id = ssin6->sin6_scope_id;
 	return true;
 }
 #else	/* !(IS_ENABLED(CONFIG_IPV6) */