From 9bac37ded632c75341b6e5c8699e9a6a5740bf44 Mon Sep 17 00:00:00 2001
From: Dave Johnson <djohnson+linux-kernel@sw.starentnetworks.com>
Date: Wed, 25 Jul 2007 19:49:29 -0400
Subject: [PATCH] --- yaml --- r: 63621 b: refs/heads/master c:
 b225b884a18a1932db5414abd3ef94a45e4e348e h: refs/heads/master i:   63619:
 d8df193ec6241583de2e5d300beb9f6d570c5aeb v: v3

---
 [refs]                | 2 +-
 trunk/net/sctp/ipv6.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dd0af822aaeb..a1938b82f3c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc121fa87a0ce356c23fb4d7358310e747cad8cc
+refs/heads/master: b225b884a18a1932db5414abd3ef94a45e4e348e
diff --git a/trunk/net/sctp/ipv6.c b/trunk/net/sctp/ipv6.c
index 2c29394fd92e..f8aa23dda1c1 100644
--- a/trunk/net/sctp/ipv6.c
+++ b/trunk/net/sctp/ipv6.c
@@ -641,6 +641,8 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,
 	newsctp6sk = (struct sctp6_sock *)newsk;
 	inet_sk(newsk)->pinet6 = &newsctp6sk->inet6;
 
+	sctp_sk(newsk)->v4mapped = sctp_sk(sk)->v4mapped;
+
 	newinet = inet_sk(newsk);
 	newnp = inet6_sk(newsk);