diff options
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 12e69d364dd5..37d14e735c27 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -971,41 +971,41 @@ static void ipv6_packet_cleanup(void) | |||
| 971 | 971 | ||
| 972 | static int __net_init ipv6_init_mibs(struct net *net) | 972 | static int __net_init ipv6_init_mibs(struct net *net) |
| 973 | { | 973 | { |
| 974 | if (snmp_mib_init((void **)net->mib.udp_stats_in6, | 974 | if (snmp_mib_init((void __percpu **)net->mib.udp_stats_in6, |
| 975 | sizeof (struct udp_mib)) < 0) | 975 | sizeof (struct udp_mib)) < 0) |
| 976 | return -ENOMEM; | 976 | return -ENOMEM; |
| 977 | if (snmp_mib_init((void **)net->mib.udplite_stats_in6, | 977 | if (snmp_mib_init((void __percpu **)net->mib.udplite_stats_in6, |
| 978 | sizeof (struct udp_mib)) < 0) | 978 | sizeof (struct udp_mib)) < 0) |
| 979 | goto err_udplite_mib; | 979 | goto err_udplite_mib; |
| 980 | if (snmp_mib_init((void **)net->mib.ipv6_statistics, | 980 | if (snmp_mib_init((void __percpu **)net->mib.ipv6_statistics, |
| 981 | sizeof(struct ipstats_mib)) < 0) | 981 | sizeof(struct ipstats_mib)) < 0) |
| 982 | goto err_ip_mib; | 982 | goto err_ip_mib; |
| 983 | if (snmp_mib_init((void **)net->mib.icmpv6_statistics, | 983 | if (snmp_mib_init((void __percpu **)net->mib.icmpv6_statistics, |
| 984 | sizeof(struct icmpv6_mib)) < 0) | 984 | sizeof(struct icmpv6_mib)) < 0) |
| 985 | goto err_icmp_mib; | 985 | goto err_icmp_mib; |
| 986 | if (snmp_mib_init((void **)net->mib.icmpv6msg_statistics, | 986 | if (snmp_mib_init((void __percpu **)net->mib.icmpv6msg_statistics, |
| 987 | sizeof(struct icmpv6msg_mib)) < 0) | 987 | sizeof(struct icmpv6msg_mib)) < 0) |
| 988 | goto err_icmpmsg_mib; | 988 | goto err_icmpmsg_mib; |
| 989 | return 0; | 989 | return 0; |
| 990 | 990 | ||
| 991 | err_icmpmsg_mib: | 991 | err_icmpmsg_mib: |
| 992 | snmp_mib_free((void **)net->mib.icmpv6_statistics); | 992 | snmp_mib_free((void __percpu **)net->mib.icmpv6_statistics); |
| 993 | err_icmp_mib: | 993 | err_icmp_mib: |
| 994 | snmp_mib_free((void **)net->mib.ipv6_statistics); | 994 | snmp_mib_free((void __percpu **)net->mib.ipv6_statistics); |
| 995 | err_ip_mib: | 995 | err_ip_mib: |
| 996 | snmp_mib_free((void **)net->mib.udplite_stats_in6); | 996 | snmp_mib_free((void __percpu **)net->mib.udplite_stats_in6); |
| 997 | err_udplite_mib: | 997 | err_udplite_mib: |
| 998 | snmp_mib_free((void **)net->mib.udp_stats_in6); | 998 | snmp_mib_free((void __percpu **)net->mib.udp_stats_in6); |
| 999 | return -ENOMEM; | 999 | return -ENOMEM; |
| 1000 | } | 1000 | } |
| 1001 | 1001 | ||
| 1002 | static void __net_exit ipv6_cleanup_mibs(struct net *net) | 1002 | static void ipv6_cleanup_mibs(struct net *net) |
| 1003 | { | 1003 | { |
| 1004 | snmp_mib_free((void **)net->mib.udp_stats_in6); | 1004 | snmp_mib_free((void __percpu **)net->mib.udp_stats_in6); |
| 1005 | snmp_mib_free((void **)net->mib.udplite_stats_in6); | 1005 | snmp_mib_free((void __percpu **)net->mib.udplite_stats_in6); |
| 1006 | snmp_mib_free((void **)net->mib.ipv6_statistics); | 1006 | snmp_mib_free((void __percpu **)net->mib.ipv6_statistics); |
| 1007 | snmp_mib_free((void **)net->mib.icmpv6_statistics); | 1007 | snmp_mib_free((void __percpu **)net->mib.icmpv6_statistics); |
| 1008 | snmp_mib_free((void **)net->mib.icmpv6msg_statistics); | 1008 | snmp_mib_free((void __percpu **)net->mib.icmpv6msg_statistics); |
| 1009 | } | 1009 | } |
| 1010 | 1010 | ||
| 1011 | static int __net_init inet6_net_init(struct net *net) | 1011 | static int __net_init inet6_net_init(struct net *net) |
| @@ -1042,7 +1042,7 @@ out: | |||
| 1042 | #endif | 1042 | #endif |
| 1043 | } | 1043 | } |
| 1044 | 1044 | ||
| 1045 | static void inet6_net_exit(struct net *net) | 1045 | static void __net_exit inet6_net_exit(struct net *net) |
| 1046 | { | 1046 | { |
| 1047 | #ifdef CONFIG_PROC_FS | 1047 | #ifdef CONFIG_PROC_FS |
| 1048 | udp6_proc_exit(net); | 1048 | udp6_proc_exit(net); |
