diff options
Diffstat (limited to 'net/xfrm')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 10 | ||||
-rw-r--r-- | net/xfrm/xfrm_proc.c | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index c08fbd11ceff..e63f242ae03e 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -2783,21 +2783,19 @@ static struct notifier_block xfrm_dev_notifier = { | |||
2783 | static int __net_init xfrm_statistics_init(struct net *net) | 2783 | static int __net_init xfrm_statistics_init(struct net *net) |
2784 | { | 2784 | { |
2785 | int rv; | 2785 | int rv; |
2786 | 2786 | net->mib.xfrm_statistics = alloc_percpu(struct linux_xfrm_mib); | |
2787 | if (snmp_mib_init((void __percpu **)net->mib.xfrm_statistics, | 2787 | if (!net->mib.xfrm_statistics) |
2788 | sizeof(struct linux_xfrm_mib), | ||
2789 | __alignof__(struct linux_xfrm_mib)) < 0) | ||
2790 | return -ENOMEM; | 2788 | return -ENOMEM; |
2791 | rv = xfrm_proc_init(net); | 2789 | rv = xfrm_proc_init(net); |
2792 | if (rv < 0) | 2790 | if (rv < 0) |
2793 | snmp_mib_free((void __percpu **)net->mib.xfrm_statistics); | 2791 | free_percpu(net->mib.xfrm_statistics); |
2794 | return rv; | 2792 | return rv; |
2795 | } | 2793 | } |
2796 | 2794 | ||
2797 | static void xfrm_statistics_fini(struct net *net) | 2795 | static void xfrm_statistics_fini(struct net *net) |
2798 | { | 2796 | { |
2799 | xfrm_proc_fini(net); | 2797 | xfrm_proc_fini(net); |
2800 | snmp_mib_free((void __percpu **)net->mib.xfrm_statistics); | 2798 | free_percpu(net->mib.xfrm_statistics); |
2801 | } | 2799 | } |
2802 | #else | 2800 | #else |
2803 | static int __net_init xfrm_statistics_init(struct net *net) | 2801 | static int __net_init xfrm_statistics_init(struct net *net) |
diff --git a/net/xfrm/xfrm_proc.c b/net/xfrm/xfrm_proc.c index fc5abd0b456f..9c4fbd8935f4 100644 --- a/net/xfrm/xfrm_proc.c +++ b/net/xfrm/xfrm_proc.c | |||
@@ -54,8 +54,7 @@ static int xfrm_statistics_seq_show(struct seq_file *seq, void *v) | |||
54 | int i; | 54 | int i; |
55 | for (i = 0; xfrm_mib_list[i].name; i++) | 55 | for (i = 0; xfrm_mib_list[i].name; i++) |
56 | seq_printf(seq, "%-24s\t%lu\n", xfrm_mib_list[i].name, | 56 | seq_printf(seq, "%-24s\t%lu\n", xfrm_mib_list[i].name, |
57 | snmp_fold_field((void __percpu **) | 57 | snmp_fold_field(net->mib.xfrm_statistics, |
58 | net->mib.xfrm_statistics, | ||
59 | xfrm_mib_list[i].entry)); | 58 | xfrm_mib_list[i].entry)); |
60 | return 0; | 59 | return 0; |
61 | } | 60 | } |