diff options
author | Denis V. Lunev <den@openvz.org> | 2008-02-29 14:13:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-29 14:13:15 -0500 |
commit | 9b0f976f27f00a81cf47643d90854659626795b4 (patch) | |
tree | 3226ff8a03faf6c8137eeb1313248dfd2a395f21 /net/ipv4 | |
parent | 4c563f7669c10a12354b72b518c2287ffc6ebfb3 (diff) |
[INET]: Remove struct net_proto_family* from _init calls.
struct net_proto_family* is not used in icmp[v6]_init, ndisc_init,
igmp_init and tcp_v4_init. Remove it.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/af_inet.c | 4 | ||||
-rw-r--r-- | net/ipv4/icmp.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index c270080f370e..a7a99ac856dc 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -1415,7 +1415,7 @@ static int __init inet_init(void) | |||
1415 | 1415 | ||
1416 | ip_init(); | 1416 | ip_init(); |
1417 | 1417 | ||
1418 | tcp_v4_init(&inet_family_ops); | 1418 | tcp_v4_init(); |
1419 | 1419 | ||
1420 | /* Setup TCP slab cache for open requests. */ | 1420 | /* Setup TCP slab cache for open requests. */ |
1421 | tcp_init(); | 1421 | tcp_init(); |
@@ -1430,7 +1430,7 @@ static int __init inet_init(void) | |||
1430 | * Set the ICMP layer up | 1430 | * Set the ICMP layer up |
1431 | */ | 1431 | */ |
1432 | 1432 | ||
1433 | icmp_init(&inet_family_ops); | 1433 | icmp_init(); |
1434 | 1434 | ||
1435 | /* | 1435 | /* |
1436 | * Initialise the multicast router | 1436 | * Initialise the multicast router |
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index a13c074dac09..98372db66c66 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -1139,7 +1139,7 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES + 1] = { | |||
1139 | }, | 1139 | }, |
1140 | }; | 1140 | }; |
1141 | 1141 | ||
1142 | void __init icmp_init(struct net_proto_family *ops) | 1142 | void __init icmp_init(void) |
1143 | { | 1143 | { |
1144 | struct inet_sock *inet; | 1144 | struct inet_sock *inet; |
1145 | int i; | 1145 | int i; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 00156bf421ca..256032a41069 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -2443,7 +2443,7 @@ struct proto tcp_prot = { | |||
2443 | REF_PROTO_INUSE(tcp) | 2443 | REF_PROTO_INUSE(tcp) |
2444 | }; | 2444 | }; |
2445 | 2445 | ||
2446 | void __init tcp_v4_init(struct net_proto_family *ops) | 2446 | void __init tcp_v4_init(void) |
2447 | { | 2447 | { |
2448 | if (inet_csk_ctl_sock_create(&tcp_socket, PF_INET, SOCK_RAW, | 2448 | if (inet_csk_ctl_sock_create(&tcp_socket, PF_INET, SOCK_RAW, |
2449 | IPPROTO_TCP) < 0) | 2449 | IPPROTO_TCP) < 0) |