From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Haley Subject: [PATCH 2/2] SCTP: change sctp_ctl_sock_init() to try IPv4 if IPv6 fails Date: Tue, 03 Mar 2009 21:38:54 -0500 Message-ID: <49ADE9BE.2040303@hp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Andrey Borzenkov , Vladislav Yasevich , Chuck Lever , Theodore Tso , Valdis.Kletnieks@vt.edu, "Rafael J. Wysocki" , "netdev@vger.kernel.org" , bonding-devel@lists.sourceforge.net, =?ISO-8859-1?Q?=22J=2EA=2E_Magall?= =?ISO-8859-1?Q?=F3n=22?= , Linux Kernel Mailing List , Jay Vosburgh To: David Miller Return-path: Received: from g5t0006.atlanta.hp.com ([15.192.0.43]:29119 "EHLO g5t0006.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750760AbZCDCjA (ORCPT ); Tue, 3 Mar 2009 21:39:00 -0500 Sender: netdev-owner@vger.kernel.org List-ID: Change sctp_ctl_sock_init() to try IPv4 if IPv6 socket registration fails. Required if the IPv6 module is loaded with "disable=1", else SCTP will fail to load. Signed-off-by: Brian Haley Signed-off-by: Vlad Yasevich --- net/sctp/protocol.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index c1e316e..e8c6287 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -692,15 +692,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"); -- 1.5.4.3