[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>

diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index 7c5e9817e998aaf0f8ec23de91ab0d39b1d237f5..8f86d6b621c81a45490da989b6fb1751e037fbd5 100644 (file)
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -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);

diff --git a/include/net/icmp.h b/include/net/icmp.h
index 9f7ef3c8baef162bb99171824e120ea0248aa222..7bf714d9d7c7834cae35f80b0dfdab8252158f45 100644 (file)
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -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 ? */

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 59b70624b0563fdc93ecfbc25291a7845502d117..5aedf324de6699c91d88b2351f527255f16a3284 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -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);
 

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 7de4ea3a04d928b12a3c93a36bfe0f9a9c6ed960..ae9774b478f5866bb1c58562dcd1b29300a55f25 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -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 */

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index c270080f370e5d5bd17b08002fdb8e3fc3e0fccc..a7a99ac856dc231ef11a6b24173a9be7a8145904 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -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

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index a13c074dac091e21fb1bb3cb1c77715ded13a5c2..98372db66c6698f498f6197e78a748120853a4c7 100644 (file)
--- 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] = {
        },
 };
 
-void __init icmp_init(struct net_proto_family *ops)
+void __init icmp_init(void)
 {
        struct inet_sock *inet;
        int i;

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 00156bf421ca092b3b5145c77a7bb51293eb87dd..256032a4106932d13463956197a53f82c08a1c61 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -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)

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index f0aa977387462dc05f6a5e2ca12afe2b51283bc3..9869f87243cff4a55075d48b09aec55a17dd64de 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -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();

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 121d517bf91c9d16467c5aa85df47efdd0b6c58e..b9b13a77ba3007001d19b0eef9d615c566dff975 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -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;

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index ab228d1ea11484892a172eb1098195f5977477f2..8ce894d90063125d43b629792e462fc54d8de0a0 100644 (file)
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -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;

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 0d33a7d32125b80f102d28e851202c16d2f14fed..1fc33c8c723206a747e49ad8234aa799227519de 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -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;