You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
877 B
Diff
30 lines
877 B
Diff
From: Wei Yongjun <weiyongjun1@huawei.com>
|
|
Date: Wed, 10 Jan 2018 13:06:46 +0000
|
|
Subject: [PATCH] netfilter: remove duplicated include
|
|
|
|
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
|
|
--- a/net/ipv6/netfilter/nf_flow_table_ipv6.c
|
|
+++ b/net/ipv6/netfilter/nf_flow_table_ipv6.c
|
|
@@ -5,7 +5,6 @@
|
|
#include <linux/rhashtable.h>
|
|
#include <linux/ipv6.h>
|
|
#include <linux/netdevice.h>
|
|
-#include <linux/ipv6.h>
|
|
#include <net/ipv6.h>
|
|
#include <net/ip6_route.h>
|
|
#include <net/neighbour.h>
|
|
--- a/net/netfilter/nf_queue.c
|
|
+++ b/net/netfilter/nf_queue.c
|
|
@@ -15,8 +15,6 @@
|
|
#include <linux/netfilter_bridge.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/rcupdate.h>
|
|
-#include <linux/netfilter_ipv4.h>
|
|
-#include <linux/netfilter_ipv6.h>
|
|
#include <net/protocol.h>
|
|
#include <net/netfilter/nf_queue.h>
|
|
#include <net/dst.h>
|