netfilter: fix some coding styles and remove moduleparam.h
authorZhitong Wang <zhitong.wangzt@alibaba-inc.com>
Tue, 13 Apr 2010 09:25:41 +0000 (11:25 +0200)
committerPatrick McHardy <kaber@trash.net>
Tue, 13 Apr 2010 09:25:41 +0000 (11:25 +0200)
Fix some coding styles and remove moduleparam.h

Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/ipv4/netfilter/nf_nat_standalone.c
net/ipv4/netfilter/nf_nat_tftp.c
net/netfilter/nf_conntrack_proto.c

index 5678e9562c15b706f930799419ae76297c4a4775..0b49248e34fa4eaea0144aa759644b0e40f4e84d 100644 (file)
@@ -137,9 +137,8 @@ nf_nat_fn(unsigned int hooknum,
                                ret = nf_nat_rule_find(skb, hooknum, in, out,
                                                       ct);
 
-                       if (ret != NF_ACCEPT) {
+                       if (ret != NF_ACCEPT)
                                return ret;
-                       }
                } else
                        pr_debug("Already setup manip %s for ct %p\n",
                                 maniptype == IP_NAT_MANIP_SRC ? "SRC" : "DST",
index b096e81500aea2b86ffa6a2e0111d94307edf2a9..7274a43c7a12f08210d09a14bb677450f598e246 100644 (file)
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/udp.h>
 
 #include <net/netfilter/nf_nat_helper.h>
index 1a4568bf7ea515ee790b700dfe85a31c38b8bdc6..f71cd5da751cf8da78290aa2ab4d0c7de3803431 100644 (file)
 #include <linux/netfilter.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
-#include <linux/skbuff.h>
 #include <linux/vmalloc.h>
 #include <linux/stddef.h>
 #include <linux/err.h>
 #include <linux/percpu.h>
-#include <linux/moduleparam.h>
 #include <linux/notifier.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>