dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Denis V. Lunev 2008-02-29 11:13:15 -08:00 committed by David S. Miller
parent 4c563f7669
commit 9b0f976f27
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/icmpv6.h
View File

@ -176,7 +176,7 @@ extern void icmpv6_send(struct sk_buff *skb,
__u32 info,
struct net_device *dev);
extern int icmpv6_init(struct net_proto_family *ops);
extern int icmpv6_init(void);
extern int icmpv6_err_convert(int type, int code,
int *err);
extern void icmpv6_cleanup(void);

2
include/net/icmp.h
View File

@ -48,7 +48,7 @@ struct sk_buff;
extern void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info);
extern int icmp_rcv(struct sk_buff *skb);
extern int icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);
extern void icmp_init(struct net_proto_family *ops);
extern void icmp_init(void);
extern void icmp_out_count(unsigned char type);
/* Move into dst.h ? */

4
include/net/ndisc.h
View File

@ -77,7 +77,7 @@ struct nd_opt_hdr {
} __attribute__((__packed__));
extern int ndisc_init(struct net_proto_family *ops);
extern int ndisc_init(void);
extern void ndisc_cleanup(void);
@ -107,7 +107,7 @@ extern int ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *d
/*
* IGMP
*/
extern int igmp6_init(struct net_proto_family *ops);
extern int igmp6_init(void);
extern void igmp6_cleanup(void);

2
include/net/tcp.h
View File

@ -1373,7 +1373,7 @@ struct tcp_request_sock_ops {
#endif
};
extern void tcp_v4_init(struct net_proto_family *ops);
extern void tcp_v4_init(void);
extern void tcp_init(void);
#endif /* _TCP_H */

4
net/ipv4/af_inet.c
View File

@ -1415,7 +1415,7 @@ static int __init inet_init(void)
ip_init();
tcp_v4_init(&inet_family_ops);
tcp_v4_init();
/* Setup TCP slab cache for open requests. */
tcp_init();
@ -1430,7 +1430,7 @@ static int __init inet_init(void)
* Set the ICMP layer up
*/
icmp_init(&inet_family_ops);
icmp_init();
/*
* Initialise the multicast router

2
net/ipv4/icmp.c
View File

@ -1139,7 +1139,7 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES + 1] = {
},
};
void __init icmp_init(struct net_proto_family *ops)
void __init icmp_init(void)
{
struct inet_sock *inet;
int i;

2
net/ipv4/tcp_ipv4.c
View File

@ -2443,7 +2443,7 @@ struct proto tcp_prot = {
REF_PROTO_INUSE(tcp)
};
void __init tcp_v4_init(struct net_proto_family *ops)
void __init tcp_v4_init(void)
{
if (inet_csk_ctl_sock_create(&tcp_socket, PF_INET, SOCK_RAW,
IPPROTO_TCP) < 0)

6
net/ipv6/af_inet6.c
View File

@ -808,13 +808,13 @@ static int __init inet6_init(void)
if (err)
goto sysctl_fail;
#endif
err = icmpv6_init(&inet6_family_ops);
err = icmpv6_init();
if (err)
goto icmp_fail;
err = ndisc_init(&inet6_family_ops);
err = ndisc_init();
if (err)
goto ndisc_fail;
err = igmp6_init(&inet6_family_ops);
err = igmp6_init();
if (err)
goto igmp_fail;
err = ipv6_netfilter_init();

2
net/ipv6/icmp.c
View File

@ -780,7 +780,7 @@ drop_no_count:
*/
static struct lock_class_key icmpv6_socket_sk_dst_lock_key;
int __init icmpv6_init(struct net_proto_family *ops)
int __init icmpv6_init(void)
{
struct sock *sk;
int err, i, j;

2
net/ipv6/mcast.c
View File

@ -2597,7 +2597,7 @@ static const struct file_operations igmp6_mcf_seq_fops = {
};
#endif
int __init igmp6_init(struct net_proto_family *ops)
int __init igmp6_init(void)
{
struct ipv6_pinfo *np;
struct sock *sk;

2
net/ipv6/ndisc.c
View File

@ -1733,7 +1733,7 @@ static int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,
#endif
int __init ndisc_init(struct net_proto_family *ops)
int __init ndisc_init(void)
{
struct ipv6_pinfo *np;
struct sock *sk;