kernel: Copy patches from kernel 4.14 to 4.19
[openwrt/staging/chunkeey.git] / target / linux / generic / backport-4.19 / 347-v4.16-netfilter-remove-duplicated-include.patch
1 From: Wei Yongjun <weiyongjun1@huawei.com>
2 Date: Wed, 10 Jan 2018 13:06:46 +0000
3 Subject: [PATCH] netfilter: remove duplicated include
4
5 Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
6 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
7 ---
8
9 --- a/net/ipv6/netfilter/nf_flow_table_ipv6.c
10 +++ b/net/ipv6/netfilter/nf_flow_table_ipv6.c
11 @@ -5,7 +5,6 @@
12 #include <linux/rhashtable.h>
13 #include <linux/ipv6.h>
14 #include <linux/netdevice.h>
15 -#include <linux/ipv6.h>
16 #include <net/ipv6.h>
17 #include <net/ip6_route.h>
18 #include <net/neighbour.h>
19 --- a/net/netfilter/nf_queue.c
20 +++ b/net/netfilter/nf_queue.c
21 @@ -15,8 +15,6 @@
22 #include <linux/netfilter_bridge.h>
23 #include <linux/seq_file.h>
24 #include <linux/rcupdate.h>
25 -#include <linux/netfilter_ipv4.h>
26 -#include <linux/netfilter_ipv6.h>
27 #include <net/protocol.h>
28 #include <net/netfilter/nf_queue.h>
29 #include <net/dst.h>