diff options
| author | Zhitong Wang <zhitong.wangzt@alibaba-inc.com> | 2010-04-13 11:25:41 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-04-13 11:25:41 +0200 |
| commit | 22068311b62858ea7eb71653a07564fd73d7a9b0 (patch) | |
| tree | 07dc379dfd29080e8217f3d36322e572e1a907bd | |
| parent | a79ff731a1b277d0e92d9453bdf374e04cec717a (diff) | |
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>
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_standalone.c | 3 | ||||
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_tftp.c | 1 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_proto.c | 2 |
3 files changed, 1 insertions, 5 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> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 1a4568bf7ea5..f71cd5da751c 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -13,12 +13,10 @@ #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> |