From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 30 Mar 2014 15:41:38 +0000 (+0200)
Subject: layer7: Remove some oneliner functions.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bb2555a000001d36cacfd5c8fa1a95254cc0497;p=people%2Fms%2Flinux.git

layer7: Remove some oneliner functions.
---

diff --git a/net/netfilter/xt_layer7.c b/net/netfilter/xt_layer7.c
index 72e903f286f4..51bb747c1979 100644
--- 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));
 }