diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-04-03 14:27:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 14:27:58 -0700 |
| commit | eee4fe4ded6e9c196168aee8f9787771f4df9c90 (patch) | |
| tree | 271a5837eef0a7f25bf7c8e1e36f413271dd70c7 /net/sctp/protocol.c | |
| parent | 8258175c811440e93baa15ab1962a5905686dda3 (diff) | |
| download | kernel_goldelico_gta04-eee4fe4ded6e9c196168aee8f9787771f4df9c90.zip kernel_goldelico_gta04-eee4fe4ded6e9c196168aee8f9787771f4df9c90.tar.gz kernel_goldelico_gta04-eee4fe4ded6e9c196168aee8f9787771f4df9c90.tar.bz2 | |
[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/protocol.c')
| -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 ac0833c..3c08d33 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -674,21 +674,19 @@ static int sctp_ctl_sock_init(void) { int err; sa_family_t family; - struct socket *socket; if (sctp_get_pf_specific(PF_INET6)) family = PF_INET6; else family = PF_INET; - err = inet_ctl_sock_create(&socket, family, + err = inet_ctl_sock_create(&sctp_ctl_sock, family, SOCK_SEQPACKET, IPPROTO_SCTP); if (err < 0) { printk(KERN_ERR "SCTP: Failed to create the SCTP control socket.\n"); return err; } - sctp_ctl_sock = socket->sk; return 0; } |