Skip to contentSkip to conversation

Netfilter: Fix some coding styles and remove moduleparam.h

PATCH Applied [email protected] 2 participants 3 messages Mar 26, 2010 – Apr 13, 2010

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

PATCH 1/1 Netfilter: Fix some coding styles and remove moduleparam.h

Fix some coding styles and remove moduleparam.h

---
 net/ipv4/netfilter/nf_nat_standalone.c |    3 +--
 net/ipv4/netfilter/nf_nat_tftp.c       |    1 -
 net/netfilter/nf_conntrack_proto.c     |    2 --
 3 files changed, 1 insertions(+), 5 deletions(-)
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
author
#1 lore raw

hi, kaber, this patch is already based on nf-next git trees.

Quoted 55 lines · On Fri, Mar 26, 2010 at 11:44 AM, <[email protected]> wrote:

Fix some coding styles and remove moduleparam.h

---
 net/ipv4/netfilter/nf_nat_standalone.c |    3 +-- net/ipv4/netfilter/nf_nat_tftp.c       |    1 - net/netfilter/nf_conntrack_proto.c     |    2 --

 3 files changed, 1 insertions(+), 5 deletions(-)
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 -3
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>
--
Quoted 3 lines

1.6.5.3

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html