diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/af_inet6.c | 6 | ||||
-rw-r--r-- | net/ipv6/icmp.c | 2 | ||||
-rw-r--r-- | net/ipv6/mcast.c | 2 | ||||
-rw-r--r-- | net/ipv6/ndisc.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index f0aa97738746..9869f87243cf 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -808,13 +808,13 @@ static int __init inet6_init(void) | |||
808 | if (err) | 808 | if (err) |
809 | goto sysctl_fail; | 809 | goto sysctl_fail; |
810 | #endif | 810 | #endif |
811 | err = icmpv6_init(&inet6_family_ops); | 811 | err = icmpv6_init(); |
812 | if (err) | 812 | if (err) |
813 | goto icmp_fail; | 813 | goto icmp_fail; |
814 | err = ndisc_init(&inet6_family_ops); | 814 | err = ndisc_init(); |
815 | if (err) | 815 | if (err) |
816 | goto ndisc_fail; | 816 | goto ndisc_fail; |
817 | err = igmp6_init(&inet6_family_ops); | 817 | err = igmp6_init(); |
818 | if (err) | 818 | if (err) |
819 | goto igmp_fail; | 819 | goto igmp_fail; |
820 | err = ipv6_netfilter_init(); | 820 | err = ipv6_netfilter_init(); |
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 121d517bf91c..b9b13a77ba30 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -780,7 +780,7 @@ drop_no_count: | |||
780 | */ | 780 | */ |
781 | static struct lock_class_key icmpv6_socket_sk_dst_lock_key; | 781 | static struct lock_class_key icmpv6_socket_sk_dst_lock_key; |
782 | 782 | ||
783 | int __init icmpv6_init(struct net_proto_family *ops) | 783 | int __init icmpv6_init(void) |
784 | { | 784 | { |
785 | struct sock *sk; | 785 | struct sock *sk; |
786 | int err, i, j; | 786 | int err, i, j; |
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index ab228d1ea114..8ce894d90063 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -2597,7 +2597,7 @@ static const struct file_operations igmp6_mcf_seq_fops = { | |||
2597 | }; | 2597 | }; |
2598 | #endif | 2598 | #endif |
2599 | 2599 | ||
2600 | int __init igmp6_init(struct net_proto_family *ops) | 2600 | int __init igmp6_init(void) |
2601 | { | 2601 | { |
2602 | struct ipv6_pinfo *np; | 2602 | struct ipv6_pinfo *np; |
2603 | struct sock *sk; | 2603 | struct sock *sk; |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 0d33a7d32125..1fc33c8c7232 100644 --- 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, | |||
1733 | 1733 | ||
1734 | #endif | 1734 | #endif |
1735 | 1735 | ||
1736 | int __init ndisc_init(struct net_proto_family *ops) | 1736 | int __init ndisc_init(void) |
1737 | { | 1737 | { |
1738 | struct ipv6_pinfo *np; | 1738 | struct ipv6_pinfo *np; |
1739 | struct sock *sk; | 1739 | struct sock *sk; |