瀏覽代碼

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>
Zhitong Wang 15 年之前
父節點
當前提交
22068311b6
共有 3 個文件被更改,包括 1 次插入5 次删除
  1. 1 2
      net/ipv4/netfilter/nf_nat_standalone.c
  2. 0 1
      net/ipv4/netfilter/nf_nat_tftp.c
  3. 0 2
      net/netfilter/nf_conntrack_proto.c

+ 1 - 2
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",

+ 0 - 1
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>

+ 0 - 2
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>