lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ICSK]: Introduce inet_csk_ctl_sock_create

Browse Source 
Consolidating open coded sequences in tcp and dccp, v4 and v6.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2006-03-20 22:01:03 -08:00
committed by David S. Miller
parent 7247887357
commit c4d9390941
6 changed files with 31 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
net/dccp/ipv4.c
View File

@@ -1099,29 +1099,6 @@ static struct inet_protosw dccp_v4_protosw = {
.flags = INET_PROTOSW_ICSK,
};
static char dccp_v4_ctl_socket_err_msg[] __initdata =
KERN_ERR "DCCP: Failed to create the control socket.\n";
static int __init dccp_v4_ctl_sock_init(void)
{
int rc = sock_create_kern(PF_INET, SOCK_DCCP, IPPROTO_DCCP,
&dccp_v4_ctl_socket);
if (rc < 0)
printk(dccp_v4_ctl_socket_err_msg);
else {
dccp_v4_ctl_socket->sk->sk_allocation = GFP_ATOMIC;
inet_sk(dccp_v4_ctl_socket->sk)->uc_ttl = -1;
/* Unhash it so that IP input processing does not even
* see it, we do not wish this socket to see incoming
* packets.
*/
dccp_v4_ctl_socket->sk->sk_prot->unhash(dccp_v4_ctl_socket->sk);
}
return rc;
}
static int __init dccp_v4_init(void)
{
int err = proto_register(&dccp_v4_prot, 1);
@@ -1135,7 +1112,8 @@ static int __init dccp_v4_init(void)
inet_register_protosw(&dccp_v4_protosw);
err = dccp_v4_ctl_sock_init();
err = inet_csk_ctl_sock_create(&dccp_v4_ctl_socket, PF_INET,
SOCK_DCCP, IPPROTO_DCCP);
if (err)
goto out_unregister_protosw;
out: