diff options
author | Denis V. Lunev <den@openvz.org> | 2008-04-03 17:27:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:27:58 -0400 |
commit | eee4fe4ded6e9c196168aee8f9787771f4df9c90 (patch) | |
tree | 271a5837eef0a7f25bf7c8e1e36f413271dd70c7 /net/sctp | |
parent | 8258175c811440e93baa15ab1962a5905686dda3 (diff) |
[INET]: Let inet_ctl_sock_create return sock rather than socket.
All upper protocol layers are already use sock internally.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/protocol.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index ac0833c19450..3c08d334d4a8 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -674,21 +674,19 @@ static int sctp_ctl_sock_init(void) | |||
674 | { | 674 | { |
675 | int err; | 675 | int err; |
676 | sa_family_t family; | 676 | sa_family_t family; |
677 | struct socket *socket; | ||
678 | 677 | ||
679 | if (sctp_get_pf_specific(PF_INET6)) | 678 | if (sctp_get_pf_specific(PF_INET6)) |
680 | family = PF_INET6; | 679 | family = PF_INET6; |
681 | else | 680 | else |
682 | family = PF_INET; | 681 | family = PF_INET; |
683 | 682 | ||
684 | err = inet_ctl_sock_create(&socket, family, | 683 | err = inet_ctl_sock_create(&sctp_ctl_sock, family, |
685 | SOCK_SEQPACKET, IPPROTO_SCTP); | 684 | SOCK_SEQPACKET, IPPROTO_SCTP); |
686 | if (err < 0) { | 685 | if (err < 0) { |
687 | printk(KERN_ERR | 686 | printk(KERN_ERR |
688 | "SCTP: Failed to create the SCTP control socket.\n"); | 687 | "SCTP: Failed to create the SCTP control socket.\n"); |
689 | return err; | 688 | return err; |
690 | } | 689 | } |
691 | sctp_ctl_sock = socket->sk; | ||
692 | return 0; | 690 | return 0; |
693 | } | 691 | } |
694 | 692 | ||