Commit 65b4b4e8 authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller
Browse files

[NETFILTER]: Rename init functions.



Every netfilter module uses `init' for its module_init() function and
`fini' or `cleanup' for its module_exit() function.

Problem is, this creates uninformative initcall_debug output and makes
ctags rather useless.

So go through and rename them all to $(filename)_init and
$(filename)_fini.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3e5d877
......@@ -58,16 +58,16 @@ static struct ebt_match filter_802_3 =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_802_3_init(void)
{
return ebt_register_match(&filter_802_3);
}
static void __exit fini(void)
static void __exit ebt_802_3_fini(void)
{
ebt_unregister_match(&filter_802_3);
}
module_init(init);
module_exit(fini);
module_init(ebt_802_3_init);
module_exit(ebt_802_3_fini);
MODULE_LICENSE("GPL");
......@@ -213,16 +213,16 @@ static struct ebt_match filter_among = {
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_among_init(void)
{
return ebt_register_match(&filter_among);
}
static void __exit fini(void)
static void __exit ebt_among_fini(void)
{
ebt_unregister_match(&filter_among);
}
module_init(init);
module_exit(fini);
module_init(ebt_among_init);
module_exit(ebt_among_fini);
MODULE_LICENSE("GPL");
......@@ -125,16 +125,16 @@ static struct ebt_match filter_arp =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_arp_init(void)
{
return ebt_register_match(&filter_arp);
}
static void __exit fini(void)
static void __exit ebt_arp_fini(void)
{
ebt_unregister_match(&filter_arp);
}
module_init(init);
module_exit(fini);
module_init(ebt_arp_init);
module_exit(ebt_arp_fini);
MODULE_LICENSE("GPL");
......@@ -82,16 +82,16 @@ static struct ebt_target reply_target =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_arpreply_init(void)
{
return ebt_register_target(&reply_target);
}
static void __exit fini(void)
static void __exit ebt_arpreply_fini(void)
{
ebt_unregister_target(&reply_target);
}
module_init(init);
module_exit(fini);
module_init(ebt_arpreply_init);
module_exit(ebt_arpreply_fini);
MODULE_LICENSE("GPL");
......@@ -61,16 +61,16 @@ static struct ebt_target dnat =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_dnat_init(void)
{
return ebt_register_target(&dnat);
}
static void __exit fini(void)
static void __exit ebt_dnat_fini(void)
{
ebt_unregister_target(&dnat);
}
module_init(init);
module_exit(fini);
module_init(ebt_dnat_init);
module_exit(ebt_dnat_fini);
MODULE_LICENSE("GPL");
......@@ -112,16 +112,16 @@ static struct ebt_match filter_ip =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_ip_init(void)
{
return ebt_register_match(&filter_ip);
}
static void __exit fini(void)
static void __exit ebt_ip_fini(void)
{
ebt_unregister_match(&filter_ip);
}
module_init(init);
module_exit(fini);
module_init(ebt_ip_init);
module_exit(ebt_ip_fini);
MODULE_LICENSE("GPL");
......@@ -98,16 +98,16 @@ static struct ebt_match ebt_limit_reg =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_limit_init(void)
{
return ebt_register_match(&ebt_limit_reg);
}
static void __exit fini(void)
static void __exit ebt_limit_fini(void)
{
ebt_unregister_match(&ebt_limit_reg);
}
module_init(init);
module_exit(fini);
module_init(ebt_limit_init);
module_exit(ebt_limit_fini);
MODULE_LICENSE("GPL");
......@@ -188,7 +188,7 @@ static struct nf_logger ebt_log_logger = {
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_log_init(void)
{
int ret;
......@@ -205,12 +205,12 @@ static int __init init(void)
return 0;
}
static void __exit fini(void)
static void __exit ebt_log_fini(void)
{
nf_log_unregister_logger(&ebt_log_logger);
ebt_unregister_watcher(&log);
}
module_init(init);
module_exit(fini);
module_init(ebt_log_init);
module_exit(ebt_log_fini);
MODULE_LICENSE("GPL");
......@@ -52,16 +52,16 @@ static struct ebt_target mark_target =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_mark_init(void)
{
return ebt_register_target(&mark_target);
}
static void __exit fini(void)
static void __exit ebt_mark_fini(void)
{
ebt_unregister_target(&mark_target);
}
module_init(init);
module_exit(fini);
module_init(ebt_mark_init);
module_exit(ebt_mark_fini);
MODULE_LICENSE("GPL");
......@@ -47,16 +47,16 @@ static struct ebt_match filter_mark =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_mark_m_init(void)
{
return ebt_register_match(&filter_mark);
}
static void __exit fini(void)
static void __exit ebt_mark_m_fini(void)
{
ebt_unregister_match(&filter_mark);
}
module_init(init);
module_exit(fini);
module_init(ebt_mark_m_init);
module_exit(ebt_mark_m_fini);
MODULE_LICENSE("GPL");
......@@ -44,16 +44,16 @@ static struct ebt_match filter_pkttype =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_pkttype_init(void)
{
return ebt_register_match(&filter_pkttype);
}
static void __exit fini(void)
static void __exit ebt_pkttype_fini(void)
{
ebt_unregister_match(&filter_pkttype);
}
module_init(init);
module_exit(fini);
module_init(ebt_pkttype_init);
module_exit(ebt_pkttype_fini);
MODULE_LICENSE("GPL");
......@@ -66,16 +66,16 @@ static struct ebt_target redirect_target =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_redirect_init(void)
{
return ebt_register_target(&redirect_target);
}
static void __exit fini(void)
static void __exit ebt_redirect_fini(void)
{
ebt_unregister_target(&redirect_target);
}
module_init(init);
module_exit(fini);
module_init(ebt_redirect_init);
module_exit(ebt_redirect_fini);
MODULE_LICENSE("GPL");
......@@ -61,16 +61,16 @@ static struct ebt_target snat =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_snat_init(void)
{
return ebt_register_target(&snat);
}
static void __exit fini(void)
static void __exit ebt_snat_fini(void)
{
ebt_unregister_target(&snat);
}
module_init(init);
module_exit(fini);
module_init(ebt_snat_init);
module_exit(ebt_snat_fini);
MODULE_LICENSE("GPL");
......@@ -180,16 +180,16 @@ static struct ebt_match filter_stp =
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_stp_init(void)
{
return ebt_register_match(&filter_stp);
}
static void __exit fini(void)
static void __exit ebt_stp_fini(void)
{
ebt_unregister_match(&filter_stp);
}
module_init(init);
module_exit(fini);
module_init(ebt_stp_init);
module_exit(ebt_stp_fini);
MODULE_LICENSE("GPL");
......@@ -281,7 +281,7 @@ static struct nf_logger ebt_ulog_logger = {
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_ulog_init(void)
{
int i, ret = 0;
......@@ -316,7 +316,7 @@ static int __init init(void)
return ret;
}
static void __exit fini(void)
static void __exit ebt_ulog_fini(void)
{
ebt_ulog_buff_t *ub;
int i;
......@@ -337,8 +337,8 @@ static void __exit fini(void)
sock_release(ebtulognl->sk_socket);
}
module_init(init);
module_exit(fini);
module_init(ebt_ulog_init);
module_exit(ebt_ulog_fini);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");
MODULE_DESCRIPTION("ebtables userspace logging module for bridged Ethernet"
......
......@@ -178,7 +178,7 @@ static struct ebt_match filter_vlan = {
.me = THIS_MODULE,
};
static int __init init(void)
static int __init ebt_vlan_init(void)
{
DEBUG_MSG("ebtables 802.1Q extension module v"
MODULE_VERS "\n");
......@@ -186,10 +186,10 @@ static int __init init(void)
return ebt_register_match(&filter_vlan);
}
static void __exit fini(void)
static void __exit ebt_vlan_fini(void)
{
ebt_unregister_match(&filter_vlan);
}
module_init(init);
module_exit(fini);
module_init(ebt_vlan_init);
module_exit(ebt_vlan_fini);
......@@ -62,7 +62,7 @@ static int ebt_broute(struct sk_buff **pskb)
return 0; /* bridge it */
}
static int __init init(void)
static int __init ebtable_broute_init(void)
{
int ret;
......@@ -74,13 +74,13 @@ static int __init init(void)
return ret;
}
static void __exit fini(void)
static void __exit ebtable_broute_fini(void)
{
br_should_route_hook = NULL;
synchronize_net();
ebt_unregister_table(&broute_table);
}
module_init(init);
module_exit(fini);
module_init(ebtable_broute_init);
module_exit(ebtable_broute_fini);
MODULE_LICENSE("GPL");
......@@ -91,7 +91,7 @@ static struct nf_hook_ops ebt_ops_filter[] = {
},
};
static int __init init(void)
static int __init ebtable_filter_init(void)
{
int i, j, ret;
......@@ -109,7 +109,7 @@ cleanup:
return ret;
}
static void __exit fini(void)
static void __exit ebtable_filter_fini(void)
{
int i;
......@@ -118,6 +118,6 @@ static void __exit fini(void)
ebt_unregister_table(&frame_filter);
}
module_init(init);
module_exit(fini);
module_init(ebtable_filter_init);
module_exit(ebtable_filter_fini);
MODULE_LICENSE("GPL");
......@@ -98,7 +98,7 @@ static struct nf_hook_ops ebt_ops_nat[] = {
},
};
static int __init init(void)
static int __init ebtable_nat_init(void)
{
int i, ret, j;
......@@ -116,7 +116,7 @@ cleanup:
return ret;
}
static void __exit fini(void)
static void __exit ebtable_nat_fini(void)
{
int i;
......@@ -125,6 +125,6 @@ static void __exit fini(void)
ebt_unregister_table(&frame_nat);
}
module_init(init);
module_exit(fini);
module_init(ebtable_nat_init);
module_exit(ebtable_nat_fini);
MODULE_LICENSE("GPL");
......@@ -1487,7 +1487,7 @@ static struct nf_sockopt_ops ebt_sockopts =
.get = do_ebt_get_ctl,
};
static int __init init(void)
static int __init ebtables_init(void)
{
int ret;
......@@ -1501,7 +1501,7 @@ static int __init init(void)
return 0;
}
static void __exit fini(void)
static void __exit ebtables_fini(void)
{
nf_unregister_sockopt(&ebt_sockopts);
printk(KERN_NOTICE "Ebtables v2.0 unregistered\n");
......@@ -1516,6 +1516,6 @@ EXPORT_SYMBOL(ebt_unregister_watcher);
EXPORT_SYMBOL(ebt_register_target);
EXPORT_SYMBOL(ebt_unregister_target);
EXPORT_SYMBOL(ebt_do_table);
module_init(init);
module_exit(fini);
module_init(ebtables_init);
module_exit(ebtables_fini);
MODULE_LICENSE("GPL");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment