summaryrefslogtreecommitdiffstats
path: root/net/ipv4/netfilter
diff options
context:
space:
mode:
authorZhitong Wang2010-04-13 11:25:41 +0200
committerPatrick McHardy2010-04-13 11:25:41 +0200
commit22068311b62858ea7eb71653a07564fd73d7a9b0 (patch)
tree07dc379dfd29080e8217f3d36322e572e1a907bd /net/ipv4/netfilter
parentnetfilter: xtables: make XT_ALIGN() usable in exported headers by exporting _... (diff)
downloadkernel-qcow2-linux-22068311b62858ea7eb71653a07564fd73d7a9b0.tar.gz
kernel-qcow2-linux-22068311b62858ea7eb71653a07564fd73d7a9b0.tar.xz
kernel-qcow2-linux-22068311b62858ea7eb71653a07564fd73d7a9b0.zip
netfilter: fix some coding styles and remove moduleparam.h
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>
Diffstat (limited to 'net/ipv4/netfilter')
-rw-r--r--net/ipv4/netfilter/nf_nat_standalone.c3
-rw-r--r--net/ipv4/netfilter/nf_nat_tftp.c1
2 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/nf_nat_standalone.c b/net/ipv4/netfilter/nf_nat_standalone.c
index 5678e9562c15..0b49248e34fa 100644
--- a/net/ipv4/netfilter/nf_nat_standalone.c
+++ b/net/ipv4/netfilter/nf_nat_standalone.c
@@ -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",
diff --git a/net/ipv4/netfilter/nf_nat_tftp.c b/net/ipv4/netfilter/nf_nat_tftp.c
index b096e81500ae..7274a43c7a12 100644
--- a/net/ipv4/netfilter/nf_nat_tftp.c
+++ b/net/ipv4/netfilter/nf_nat_tftp.c
@@ -6,7 +6,6 @@
*/
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/udp.h>
#include <net/netfilter/nf_nat_helper.h>