From: Arnaldo Carvalho de Melo Date: Tue, 21 Mar 2006 05:24:42 +0000 (-0800) Subject: [DCCP]: Rename init_dccp_v4_mibs to dccp_mib_init X-Git-Tag: v2.6.17-rc1~1175^2~123 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46f09ffa7db595f49fb42338e013417756816d37;p=linux-2.6 [DCCP]: Rename init_dccp_v4_mibs to dccp_mib_init And introduce dccp_mib_exit grouping previously open coded sequence. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller --- diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 3ba1ff4357..abab6c10af 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -933,7 +933,7 @@ void dccp_ctl_sock_exit(void) EXPORT_SYMBOL_GPL(dccp_ctl_sock_exit); #endif -static int __init init_dccp_v4_mibs(void) +static int __init dccp_mib_init(void) { int rc = -ENOMEM; @@ -955,6 +955,13 @@ out_free_one: } +static int dccp_mib_exit(void) +{ + free_percpu(dccp_statistics[0]); + free_percpu(dccp_statistics[1]); + dccp_statistics[0] = dccp_statistics[1] = NULL; +} + static int thash_entries; module_param(thash_entries, int, 0444); MODULE_PARM_DESC(thash_entries, "Number of ehash buckets"); @@ -1044,7 +1051,7 @@ static int __init dccp_init(void) INIT_HLIST_HEAD(&dccp_hashinfo.bhash[i].chain); } - rc = init_dccp_v4_mibs(); + rc = dccp_mib_init(); if (rc) goto out_free_dccp_bhash; @@ -1075,9 +1082,7 @@ out_unregister_protosw: inet_unregister_protosw(&dccp_v4_protosw); inet_del_protocol(&dccp_protocol, IPPROTO_DCCP); out_free_dccp_v4_mibs: - free_percpu(dccp_statistics[0]); - free_percpu(dccp_statistics[1]); - dccp_statistics[0] = dccp_statistics[1] = NULL; + dccp_mib_exit(); out_free_dccp_bhash: free_pages((unsigned long)dccp_hashinfo.bhash, bhash_order); dccp_hashinfo.bhash = NULL; @@ -1102,8 +1107,7 @@ static void __exit dccp_fini(void) if (inet_del_protocol(&dccp_protocol, IPPROTO_DCCP) < 0) printk(dccp_del_proto_err_msg); - free_percpu(dccp_statistics[0]); - free_percpu(dccp_statistics[1]); + dccp_mib_exit(); free_pages((unsigned long)dccp_hashinfo.bhash, get_order(dccp_hashinfo.bhash_size * sizeof(struct inet_bind_hashbucket)));