---

yaml --- r: 132143 b: refs/heads/master c: fb13d9f h: refs/heads/master i: 132141: 6d4893e 132139: c97302e 132135: a3fddab 132127: c8764d4 v: v3
git-mirror · Mar 4, 2009 · 79a2385 · 79a2385
1 parent 6f282a1
commit 79a2385
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe7ca2e1e847b65c12d245cbf402af89da96888a
+refs/heads/master: fb13d9f9e450bceafd88ac8a98f7a98e8096a5fe
diff --git a/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c
@@ -717,15 +717,20 @@ static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
 static int sctp_ctl_sock_init(void)
 {
 	int err;
-	sa_family_t family;
+	sa_family_t family = PF_INET;
 
 	if (sctp_get_pf_specific(PF_INET6))
 		family = PF_INET6;
-	else
-		family = PF_INET;
 
 	err = inet_ctl_sock_create(&sctp_ctl_sock, family,
 				   SOCK_SEQPACKET, IPPROTO_SCTP, &init_net);
+
+	/* If IPv6 socket could not be created, try the IPv4 socket */
+	if (err < 0 && family == PF_INET6)
+		err = inet_ctl_sock_create(&sctp_ctl_sock, AF_INET,
+					   SOCK_SEQPACKET, IPPROTO_SCTP,
+					   &init_net);
+
 	if (err < 0) {
 		printk(KERN_ERR
 		       "SCTP: Failed to create the SCTP control socket.\n");