You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.1 KiB
37 lines
1.1 KiB
6 years ago
|
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||
|
|
Date: Thu, 21 Dec 2017 10:17:38 +0100
|
||
|
|
Subject: [PATCH] batman-adv: Let packet.h include its headers directly
|
||
|
|
|
||
|
|
The headers used by packet.h should also be included by it directly. main.h
|
||
|
|
is currently dealing with it in batman-adv, but this will no longer work
|
||
|
|
when this header is moved to include/uapi/linux/.
|
||
|
|
|
||
|
|
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/net/batman-adv/main.h
|
||
|
|
+++ b/net/batman-adv/main.h
|
||
|
|
@@ -184,10 +184,8 @@ enum batadv_uev_type {
|
||
|
|
|
||
|
|
/* Kernel headers */
|
||
|
|
|
||
|
|
-#include <linux/bitops.h> /* for packet.h */
|
||
|
|
#include <linux/compiler.h>
|
||
|
|
#include <linux/etherdevice.h>
|
||
|
|
-#include <linux/if_ether.h> /* for packet.h */
|
||
|
|
#include <linux/if_vlan.h>
|
||
|
|
#include <linux/jiffies.h>
|
||
|
|
#include <linux/percpu.h>
|
||
|
|
--- a/net/batman-adv/packet.h
|
||
|
|
+++ b/net/batman-adv/packet.h
|
||
|
|
@@ -19,6 +19,8 @@
|
||
|
|
#define _NET_BATMAN_ADV_PACKET_H_
|
||
|
|
|
||
|
|
#include <asm/byteorder.h>
|
||
|
|
+#include <linux/bitops.h>
|
||
|
|
+#include <linux/if_ether.h>
|
||
|
|
#include <linux/types.h>
|
||
|
|
|
||
|
|
#define batadv_tp_is_error(n) ((u8)(n) > 127 ? 1 : 0)
|