diff options
| author | Zhitong Wang <zhitong.wangzt@alibaba-inc.com> | 2010-04-13 05:25:41 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-04-13 05:25:41 -0400 |
| commit | 22068311b62858ea7eb71653a07564fd73d7a9b0 (patch) | |
| tree | 07dc379dfd29080e8217f3d36322e572e1a907bd /net | |
| 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>
Diffstat (limited to '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, | |||
| 137 | ret = nf_nat_rule_find(skb, hooknum, in, out, | 137 | ret = nf_nat_rule_find(skb, hooknum, in, out, |
| 138 | ct); | 138 | ct); |
| 139 | 139 | ||
| 140 | if (ret != NF_ACCEPT) { | 140 | if (ret != NF_ACCEPT) |
| 141 | return ret; | 141 | return ret; |
| 142 | } | ||
| 143 | } else | 142 | } else |
| 144 | pr_debug("Already setup manip %s for ct %p\n", | 143 | pr_debug("Already setup manip %s for ct %p\n", |
| 145 | maniptype == IP_NAT_MANIP_SRC ? "SRC" : "DST", | 144 | 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 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 9 | #include <linux/moduleparam.h> | ||
| 10 | #include <linux/udp.h> | 9 | #include <linux/udp.h> |
| 11 | 10 | ||
| 12 | #include <net/netfilter/nf_nat_helper.h> | 11 | #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 @@ | |||
| 13 | #include <linux/netfilter.h> | 13 | #include <linux/netfilter.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/mutex.h> | 15 | #include <linux/mutex.h> |
| 16 | #include <linux/skbuff.h> | ||
| 17 | #include <linux/vmalloc.h> | 16 | #include <linux/vmalloc.h> |
| 18 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
| 19 | #include <linux/err.h> | 18 | #include <linux/err.h> |
| 20 | #include <linux/percpu.h> | 19 | #include <linux/percpu.h> |
| 21 | #include <linux/moduleparam.h> | ||
| 22 | #include <linux/notifier.h> | 20 | #include <linux/notifier.h> |
| 23 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 24 | #include <linux/netdevice.h> | 22 | #include <linux/netdevice.h> |