kernel: backport flow dissector batman-adv support
[openwrt/openwrt.git] / target / linux / generic / backport-4.14 / 270-batman-adv-Let-packet.h-include-its-headers-directly.patch
1 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
2 Date: Thu, 21 Dec 2017 10:17:38 +0100
3 Subject: [PATCH] batman-adv: Let packet.h include its headers directly
4
5 The headers used by packet.h should also be included by it directly. main.h
6 is currently dealing with it in batman-adv, but this will no longer work
7 when this header is moved to include/uapi/linux/.
8
9 Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
10 Signed-off-by: David S. Miller <davem@davemloft.net>
11 ---
12
13 --- a/net/batman-adv/main.h
14 +++ b/net/batman-adv/main.h
15 @@ -184,10 +184,8 @@ enum batadv_uev_type {
16
17 /* Kernel headers */
18
19 -#include <linux/bitops.h> /* for packet.h */
20 #include <linux/compiler.h>
21 #include <linux/etherdevice.h>
22 -#include <linux/if_ether.h> /* for packet.h */
23 #include <linux/if_vlan.h>
24 #include <linux/jiffies.h>
25 #include <linux/percpu.h>
26 --- a/net/batman-adv/packet.h
27 +++ b/net/batman-adv/packet.h
28 @@ -19,6 +19,8 @@
29 #define _NET_BATMAN_ADV_PACKET_H_
30
31 #include <asm/byteorder.h>
32 +#include <linux/bitops.h>
33 +#include <linux/if_ether.h>
34 #include <linux/types.h>
35
36 #define batadv_tp_is_error(n) ((u8)(n) > 127 ? 1 : 0)