Skip to contentSkip to conversation

Netfilter: Code cleanup on net/netfilter

PATCH In review [email protected] 2 participants 3 messages Mar 25, 2010 – Mar 26, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Netfilter: Code cleanup on net/netfilter

Fix some coding styles and remove moduleparam.h

---
 net/ipv4/netfilter/nf_nat_h323.c       |    1 -
 net/ipv4/netfilter/nf_nat_standalone.c |    3 +--
 net/ipv4/netfilter/nf_nat_tftp.c       |    1 -
 net/netfilter/nf_conntrack_proto.c     |    2 --
 4 files changed, 1 insertions(+), 6 deletions(-)
net/ipv4/netfilter/nf_nat_h323.c +0 -1
index 7e8e6fc..d4c0618 100644
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/tcp.h>
 #include <net/tcp.h>
 
net/ipv4/netfilter/nf_nat_standalone.c +1 -2
index 5678e95..0b49248 100644
@@ -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",
net/ipv4/netfilter/nf_nat_tftp.c +0 -1
index b096e81..7274a43 100644
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/udp.h>
 
 #include <net/netfilter/nf_nat_helper.h>
net/netfilter/nf_conntrack_proto.c +0 -2
index 1a4568b..f71cd5d 100644
@@ -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>
Signature · 1 line
1.6.5.3
#1 lore raw
Quoted 1 line · [email protected] wrote:

Fix some coding styles and remove moduleparam.h

I've already applied your patches to remove moduleparam.h. Please base your patches on

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

author
#2 lore raw

ok, thx, i'll send a new patch soon.

Quoted 8 lines · Patrick McHardy
Quoted 1 line · [email protected] wrote:

Fix some coding styles and remove moduleparam.h

I've already applied your patches to remove moduleparam.h. Please base your patches on

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git