diff --git a/[refs] b/[refs]
index 8688b41fe6ba..40167a61e8c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4553e88d876e7eb29db3e8f632101398900d2194
+refs/heads/master: a2c395846cf6abfdda3c04a19a0982adbb6469c2
diff --git a/trunk/net/sctp/associola.c b/trunk/net/sctp/associola.c
index f4b23043b610..e7b69a7360e2 100644
--- a/trunk/net/sctp/associola.c
+++ b/trunk/net/sctp/associola.c
@@ -293,7 +293,8 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
 	 * told otherwise.
 	 */
 	asoc->peer.ipv4_address = 1;
-	asoc->peer.ipv6_address = 1;
+	if (asoc->base.sk->sk_family == PF_INET6)
+		asoc->peer.ipv6_address = 1;
 	INIT_LIST_HEAD(&asoc->asocs);
 
 	asoc->autoclose = sp->autoclose;