layer7: Remove some oneliner functions.

diff --git a/net/netfilter/xt_layer7.c b/net/netfilter/xt_layer7.c
index 72e903f286f4601cacbbe57e9d5109b4a7e24abc..51bb747c1979704aa2cc76358fe10440db7c1bd3 100644 (file)
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
@@ -591,23 +591,14 @@ static const struct file_operations layer7_numpackets_proc_fops = {
        .write   = layer7_numpackets_write_proc,
 };
 
-static void layer7_cleanup_proc(void)
+static int __init xt_layer7_init(void)
 {
-       remove_proc_entry("layer7_numpackets", init_net.proc_net);
-}
+       need_conntrack();
 
-/* register the proc file */
-static void layer7_init_proc(void)
-{
+       // Register proc interface
        proc_create_data("layer7_numpackets", 0644,
                init_net.proc_net, &layer7_numpackets_proc_fops, NULL);
-}
 
-static int __init xt_layer7_init(void)
-{
-       need_conntrack();
-
-       layer7_init_proc();
        if(maxdatalen < 1) {
                printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
                        "using 1\n");
@@ -626,7 +617,7 @@ static int __init xt_layer7_init(void)
 
 static void __exit xt_layer7_fini(void)
 {
-       layer7_cleanup_proc();
+       remove_proc_entry("layer7_numpackets", init_net.proc_net);
        xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
 }